fix #42, wrong indentation in continual lines

Other conditions like comments, open blocks should be checked first
wwwjfy · Feb 15, 2021 · a7c953b · a7c953b
1 parent db257db
commit a7c953b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/fish-mode.el b/fish-mode.el
@@ -521,11 +521,6 @@ POSITIVE-RE and NEGATIVE-RE are regular expressions."
           (forward-line -1)
 
           (cond
-           ((line-continued-p)
-            ;;  Return indentation of previous non-continued line.
-            (back-to-non-continued)
-            (throw :indent (current-indentation)))
-
            ((fish/at-empty-line?)
             ;; Return indentation of previous non-continued line.
             (back-to-non-continued)
@@ -554,6 +549,11 @@ POSITIVE-RE and NEGATIVE-RE are regular expressions."
            ((fish/at-open-end?)
             (throw :indent (- (current-indentation) fish-indent-offset)))
 
+           ((line-continued-p)
+            ;;  Return indentation of previous non-continued line.
+            (back-to-non-continued)
+            (throw :indent (current-indentation)))
+
            (t
             ;;  Return current indentation.
             (throw :indent (current-indentation)))))))))

diff --git a/test-syntax.fish b/test-syntax.fish
@@ -125,7 +125,10 @@ function print_status
     foo \
         bar \
         baz \
-        quux
+        quux \
+        while true
+            foo
+        end
 end
 
 find . \
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,10 @@ function print_status @@
         foo \
             bar \
             baz \
-            quux
+            quux \
+            while true
+                foo
+            end
     end
     find . \
@@ Expand Down @@