[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode cc2435b 359/486: Merge pull request #264 from jj
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode cc2435b 359/486: Merge pull request #264 from jjwest/master |
Date: |
Sat, 7 Aug 2021 09:25:52 -0400 (EDT) |
branch: elpa/rust-mode
commit cc2435b9e5899c0787929a62dc6e6dcdb982febc
Merge: 0d408d5 b861aa9
Author: Niko Matsakis <niko@alum.mit.edu>
Commit: GitHub <noreply@github.com>
Merge pull request #264 from jjwest/master
Fixed indent when ? operator is used in chained method calls
---
rust-mode-tests.el | 24 ++++++++++++++++++++++++
rust-mode.el | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index fd29d5d..3e6c67a 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1668,6 +1668,18 @@ fn main() {
"
)))
+(ert-deftest indent-method-chains-no-align-with-question-mark-operator ()
+ (let ((rust-indent-method-chain nil)) (test-indent
+ "
+fn main() {
+ let x = thing.do_it()
+ .aligned()
+ .more_alignment()?
+ .more_alignment();
+}
+"
+ )))
+
(ert-deftest indent-method-chains-with-align ()
(let ((rust-indent-method-chain t)) (test-indent
"
@@ -1679,6 +1691,18 @@ fn main() {
"
)))
+(ert-deftest indent-method-chains-with-align-with-question-mark-operator ()
+ (let ((rust-indent-method-chain t)) (test-indent
+ "
+fn main() {
+ let x = thing.do_it()
+ .aligned()
+ .more_alignment()?
+ .more_alignment();
+}
+"
+ )))
+
(ert-deftest indent-method-chains-with-align-and-second-stmt ()
(let ((rust-indent-method-chain t)) (test-indent
"
diff --git a/rust-mode.el b/rust-mode.el
index 0c31b6c..908b892 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -320,7 +320,7 @@ buffer."
(- (current-column) rust-indent-offset)))))
(cond
;; foo.bar(...)
- ((rust-looking-back-str ")")
+ ((looking-back "[)?]" (1- (point)))
(backward-list 1)
(funcall skip-dot-identifier))
@@ -501,7 +501,7 @@ buffer."
;; ..or if the previous line ends with any of these:
;; { ? : ( , ; [ }
;; then we are at the beginning of an expression, so
stay on the baseline...
- (looking-back "[(,:;?[{}]\\|[^|]|" (- (point) 2))
+ (looking-back "[(,:;[{}]\\|[^|]|" (- (point) 2))
;; or if the previous line is the end of an
attribute, stay at the baseline...
(progn
(rust-rewind-to-beginning-of-current-level-expr) (looking-at "#")))))
baseline
- [nongnu] elpa/rust-mode dea81aa 334/486: Types get correct font-lock in if-let statements, (continued)
- [nongnu] elpa/rust-mode dea81aa 334/486: Types get correct font-lock in if-let statements, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode ac5dac0 335/486: Added test for if-let font lock, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 6550d94 336/486: Renamed and relocated if-let font-lock test, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a814cd8 338/486: Pass 'visible to get-buffer-window, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode c8280ae 339/486: Merge pull request #235 from tromey/get-buffer-window-fixlet, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode fca71c6 342/486: feat(rust-mode): add yield to the keywords list, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode eae291a 343/486: Merge pull request #240 from michael-zapata/feat/add-yield-keyword, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b7cd368 346/486: % as punctuation character., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 04e3078 347/486: Merge pull request #244 from kubo39/percent-as-punctuation-character, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b911835 356/486: Merge pull request #262 from kngwyu/highlight-dyn, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode cc2435b 359/486: Merge pull request #264 from jjwest/master,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 3ced187 360/486: remove old-style compilation regex; support `:::` regex, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 07e16c6 364/486: Merge pull request #265 from brotzeit/infotype, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode ee262cc 373/486: Merge pull request #266 from brotzeit/format-on-save, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 12cb169 375/486: Merge pull request #284 from riscy/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8452093 278/486: put remaining defcustoms into the rust-mode group, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8f1297a 281/486: Merge pull request #187 from tspiteri/format-other-buffers, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 5c68caf 282/486: Merge pull request #175 from mrBliss/imenu-unsafe, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f269c5e 292/486: fix syntax of "<" appearing after "?", ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 491ae0e 301/486: Remove unnecessary debugging message, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 60a1f36 310/486: Merge pull request #216 from Aankhen/set-compile-command, ELPA Syncer, 2021/08/07