One indent after open paren with no argument

2013-08-29 23:28:36 -04:00 · 2013-08-29 23:28:36 -04:00 · 0b9dc80d49
commit 0b9dc80d49
parent 20def31768
1 changed files with 8 additions and 2 deletions
--- a/src/etc/emacs/rust-mode.el
+++ b/src/etc/emacs/rust-mode.el
@ -68,7 +68,13 @@
               (let ((pt (point)))
                 (rust-rewind-irrelevant)
                 (backward-up-list)
-                 (if (looking-at "[[(]")
+                 (if (and
+                      (looking-at "[[(]")
+                      ; We don't want to indent out to the open bracket if the
+                      ; open bracket ends the line
+                      (save-excursion 
+                        (forward-char)
+                        (not (looking-at "[[:space:]]*\\(?://.*\\)?$"))))
                     (+ 1 (current-column))
                   (progn
                     (goto-char pt)
@ -80,7 +86,7 @@
                         (beginning-of-line)
                         (rust-rewind-irrelevant)
                         (end-of-line)
-                         (if (looking-back "[,;{}][[:space:]]*\\(?://.*\\)?")
+                         (if (looking-back "[,;{}(][[:space:]]*\\(?://.*\\)?")
                             (* rust-indent-offset level)
                           (back-to-indentation)
                           (if (looking-at "#")