summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Mazzuca <npmazzuca@gmail.com>2015-04-13 20:01:47 -0700
committerNicholas Mazzuca <npmazzuca@gmail.com>2015-04-13 20:01:47 -0700
commitce976b985875017c64c6d72bc89d915b62063ebf (patch)
tree732e5c235efbdbd2f5c41ffc9da853cce123fae3
parent42730b1bdc5947ad2d5f50505221f1aadd84d792 (diff)
downloadrust-mode-ce976b985875017c64c6d72bc89d915b62063ebf.tar.gz
Fix "-> Type" on a single line indentation
-rw-r--r--rust-mode.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/rust-mode.el b/rust-mode.el
index b518c87..2f23ef2 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -102,6 +102,9 @@
(defun rust-rewind-to-beginning-of-current-level-expr ()
(let ((current-level (rust-paren-level)))
(back-to-indentation)
+ (when (looking-at "->")
+ (rust-rewind-irrelevant)
+ (back-to-indentation))
(while (> (rust-paren-level) current-level)
(backward-up-list)
(back-to-indentation))))
@@ -179,7 +182,7 @@
(+ (current-column) rust-indent-offset))))))
(cond
;; Indent inside a non-raw string only if the the previous line
- ;; ends with a backslash that is is inside the same string
+ ;; ends with a backslash that is inside the same string
((nth 3 (syntax-ppss))
(let*
((string-begin-pos (nth 8 (syntax-ppss)))
@@ -232,7 +235,7 @@
(or (rust-align-to-expr-after-brace)
(+ baseline rust-indent-offset))))
- ;; A closing brace is 1 level unindended
+ ;; A closing brace is 1 level unindented
((looking-at "}") (- baseline rust-indent-offset))
;; Doc comments in /** style with leading * indent to line up the *s