* sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation
within $(...).
* test/indent/shell.sh: Add corresponding test.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 02d329d794dc9113bf3b1ba964a4e1bd1681e733..7f89ab2762c389eb93fc5e6a60ce3c0aeff4eb72 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2115,7 +2115,11 @@ May return nil if the line should not be treated as continued."
     ;; sh-indent-after-done: aligned completely differently.
     (`(:after . "in") (sh-var-value 'sh-indent-for-case-label))
     ;; sh-indent-for-continuation: Line continuations are handled differently.
-    (`(:after . ,(or `"(" `"{" `"[")) (sh-var-value 'sh-indent-after-open))
+    (`(:after . ,(or `"(" `"{" `"["))
+     (if (not (looking-at ".[ \t]*[^\n \t#]"))
+         (sh-var-value 'sh-indent-after-open)
+       (goto-char (1- (match-end 0)))
+       `(column . ,(current-column))))
     ;; sh-indent-after-function: we don't handle it differently.
     ))
 

diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index b0f69bd9720e065e09cae2a4bd1260ccf18e20e9..dc184ea0d77cbeeacd6f24171b4355b78f2ba9f7 100755 (executable)
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -3,6 +3,9 @@
 
 setlock -n /tmp/getmail.lock && echo getmail isn\'t running
 
+toto=$(grep hello foo |
+           wc)
+
 # adsgsdg
 
 if foo; then