[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode 12480f9 045/486: One indent after open paren wit
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode 12480f9 045/486: One indent after open paren with no argument |
Date: |
Sat, 7 Aug 2021 09:24:45 -0400 (EDT) |
branch: elpa/rust-mode
commit 12480f9557fa9d1bcf5d63629a06bd7090d1f601
Author: Micah Chalmer <micah@micahchalmer.net>
Commit: Micah Chalmer <micah@micahchalmer.net>
One indent after open paren with no argument
---
rust-mode.el | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/rust-mode.el b/rust-mode.el
index b79d093..8cf6c45 100644
--- a/rust-mode.el
+++ b/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 "#")
- [nongnu] branch elpa/rust-mode created (now 494d59f), ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8b8d1ea 022/486: fix indentation, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c3c5f1c 025/486: emacs mode: include use as a keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4c1eab5 036/486: rewrite rust-mode to use font-lock-mode and emacs builtin syntax analysis, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 12480f9 045/486: One indent after open paren with no argument,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 2765de7 050/486: Allow indenting to align struct fields after curly brace, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode e9b1bfe 006/486: Add 'do' to rust-mode, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a25cc60 005/486: More keyword paring and migration in runtime, docs, code modes., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode fb23ccc 003/486: emacs: Make 'mut' a keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode de81353 014/486: Merge pull request #3185 from megakorre/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 5afc8ab 015/486: initial stab at making rust-mode elpa friendly, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 7ce29ed 016/486: proper package footer, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 38940ff 027/486: rust-mode: Add 'ref' keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 9f9dec0 028/486: rust-mode.el uses the 'cl macros, so it should actually require them, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 1076b9c 035/486: Note incompatibility with global-whitespace-mode., ELPA Syncer, 2021/08/07