mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression of multi-line statement indents

Browse Source
This commit is contained in:
Micah Chalmer 2013-09-07 00:38:23 -04:00
parent fcf18786b4
commit be4f19ae7c
2 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/etc/emacs/rust-mode-tests.el
View File

@ -378,3 +378,15 @@ fn nexted_fns(a: fn(b:int,
}
"
))
(ert-deftest indent-multi-line-expr ()
(test-indent
"
fn foo()
{
x();
let a =
b();
}
"
))

47
src/etc/emacs/rust-mode.el
View File

@ -48,13 +48,12 @@
(if (/= starting (point))
(rust-rewind-irrelevant))))
(defun rust-first-indent-after-brace ()
(defun rust-align-to-expr-after-brace ()
(save-excursion
(forward-char)
(if (looking-at "[[:blank:]]*\\(?://.*\\)?$")
;; We don't want to indent out to the open bracket if the
;; open bracket ends the line
(* rust-indent-offset (rust-paren-level))
;; We don't want to indent out to the open bracket if the
;; open bracket ends the line
(when (not (looking-at "[[:blank:]]*\\(?://.*\\)?$"))
(when (looking-at "[[:space:]]") (forward-to-word 1))
(current-column))))
@ -69,7 +68,8 @@
((looking-at "->")
(save-excursion
(backward-list)
(rust-first-indent-after-brace)))
(or (rust-align-to-expr-after-brace)
(* rust-indent-offset (+ 1 level)))))
;; A closing brace is 1 level unindended
((looking-at "}") (* rust-indent-offset (- level 1)))
@ -91,24 +91,25 @@
(let ((pt (point)))
(rust-rewind-irrelevant)
(backward-up-list)
(if (looking-at "[[({]")
(rust-first-indent-after-brace)
(progn
(goto-char pt)
(back-to-indentation)
(if (looking-at "\\<else\\>")
(* rust-indent-offset (+ 1 level))
(progn
(goto-char pt)
(beginning-of-line)
(rust-rewind-irrelevant)
(end-of-line)
(if (looking-back "[[,;{}(][[:space:]]*\\(?://.*\\)?")
(* rust-indent-offset level)
(back-to-indentation)
(if (looking-at "#")
(or (and (looking-at "[[({]")
(rust-align-to-expr-after-brace))
(progn
(goto-char pt)
(back-to-indentation)
(if (looking-at "\\<else\\>")
(* rust-indent-offset (+ 1 level))
(progn
(goto-char pt)
(beginning-of-line)
(rust-rewind-irrelevant)
(end-of-line)
(if (looking-back
"[[,;{}(][[:space:]]*\\(?://.*\\)?")
(* rust-indent-offset level)
(* rust-indent-offset (+ 1 level))))))))))
(back-to-indentation)
(if (looking-at "#")
(* rust-indent-offset level)
(* rust-indent-offset (+ 1 level))))))))))
;; Otherwise we're in a column-zero definition
(t 0))))))