[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode fa5b38f 218/486: Merge pull request #117 from Th
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode fa5b38f 218/486: Merge pull request #117 from TheBB/fix-closing-delim |
Date: |
Sat, 7 Aug 2021 09:25:22 -0400 (EDT) |
branch: elpa/rust-mode
commit fa5b38feac9c5b4da7427b97832b813e20b8e276
Merge: 2cd3cf9 6252cf1
Author: Felix S Klock II <pnkfelix@pnkfx.org>
Commit: Felix S Klock II <pnkfelix@pnkfx.org>
Merge pull request #117 from TheBB/fix-closing-delim
Fix indentation of closing delimiters
---
rust-mode-tests.el | 19 +++++++++++++++++++
rust-mode.el | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index e41245f..8375d35 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -631,6 +631,25 @@ fn args_on_the_next_line( // with a comment
}
"))
+(ert-deftest indent-closing-square-bracket ()
+ (test-indent
+ "fn blergh() {
+ let list = vec![
+ 1,
+ 2,
+ 3,
+ ];
+}"))
+
+(ert-deftest indent-closing-paren ()
+ (test-indent
+ "fn blergh() {
+ call(
+ a,
+ function
+ );
+}"))
+
(ert-deftest indent-nested-fns ()
(test-indent
"
diff --git a/rust-mode.el b/rust-mode.el
index 4697c70..a1a3db4 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -373,7 +373,7 @@ function or trait. When nil, where will be aligned with fn
or trait."
(+ baseline rust-indent-offset))))
;; A closing brace is 1 level unindented
- ((looking-at "}") (- baseline rust-indent-offset))
+ ((looking-at "[]})]") (- baseline rust-indent-offset))
;; Doc comments in /** style with leading * indent to line up
the *s
((and (nth 4 (syntax-ppss)) (looking-at "*"))
- [nongnu] elpa/rust-mode 4b56ffe 020/486: update readme with package.el installation steps, (continued)
- [nongnu] elpa/rust-mode 4b56ffe 020/486: update readme with package.el installation steps, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 58c47a3 021/486: add instructions for install from MELPA, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode bda009d 023/486: add auto-mode-alist to autoloads, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode aa3ee6a 026/486: rust-mode: Add pub and priv, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode ac92ff6 037/486: etc: add the `in` keyword to the emacs mode., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 9640fe8 051/486: Indent return type to align with arguments, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 0256f02 302/486: Fix stupid mistake in rustfmt conditional, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 3220937 304/486: Merge pull request #209 from tromey/default-keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a33b684 207/486: Fix #103: comment indentation after struct members, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 339afba 206/486: Highlight the unsafe keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode fa5b38f 218/486: Merge pull request #117 from TheBB/fix-closing-delim,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 1ceac8b 212/486: Re-fontify buffer after it is reverted, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 01db4cb 225/486: Fix font-locking for Unicode escapes in character literals., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b874bbe 213/486: Merge pull request #113 from MicahChalmer/fix-issue-104, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 2cd3cf9 216/486: Merge pull request #116 from Wilfred/type_annotation_highlighting, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 3517321 230/486: Merge pull request #129 from MicahChalmer/fix-issue-127, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8400638 241/486: update README.md and Package-Requires to require emacs 24, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c3feac1 243/486: Fill regular block comments correctly too, in addition to rustdoc comments, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 1587839 268/486: Merge pull request #169 from mrBliss/fix-168, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 664c7b0 277/486: improve position recovery in rust-format-buffer, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 46e7fc0 285/486: fix PR link in README, ELPA Syncer, 2021/08/07