[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode 2a81393 094/486: added optional method chain ind
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode 2a81393 094/486: added optional method chain indentations for emacs major mode |
Date: |
Sat, 7 Aug 2021 09:24:56 -0400 (EDT) |
branch: elpa/rust-mode
commit 2a81393b29fc0b133056d8a8c3cd8d0221fa7def
Author: Daniel Raloff <draloff@side2.com>
Commit: Daniel Raloff <draloff@side2.com>
added optional method chain indentations for emacs major mode
---
rust-mode.el | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/rust-mode.el b/rust-mode.el
index 6917e9e..f66df6c 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -49,6 +49,11 @@
:type 'integer
:group 'rust-mode)
+(defcustom rust-indent-method-chain nil
+ "Indent Rust method chains, aligned by the '.' operators"
+ :type 'boolean
+ :group 'rust-mode)
+
(defun rust-paren-level () (nth 0 (syntax-ppss)))
(defun rust-in-str-or-cmnt () (nth 8 (syntax-ppss)))
(defun rust-rewind-past-str-cmnt () (goto-char (nth 8 (syntax-ppss))))
@@ -72,6 +77,15 @@
(backward-word 1))
(current-column))))
+(defun rust-align-to-method-chain ()
+ (save-excursion
+ (previous-line)
+ (end-of-line)
+ (backward-word 1)
+ (backward-char)
+ (when (looking-at "\\..+\(.*\)\n")
+ (- (current-column) rust-indent-offset))))
+
(defun rust-rewind-to-beginning-of-current-level-expr ()
(let ((current-level (rust-paren-level)))
(back-to-indentation)
@@ -94,10 +108,13 @@
;; the inside of it correctly relative to the outside.
(if (= 0 level)
0
+ (or
+ (when rust-indent-method-chain
+ (rust-align-to-method-chain))
(save-excursion
(backward-up-list)
(rust-rewind-to-beginning-of-current-level-expr)
- (+ (current-column) rust-indent-offset)))))
+ (+ (current-column) rust-indent-offset))))))
(cond
;; A function return type is indented to the corresponding
function arguments
((looking-at "->")
@@ -109,6 +126,16 @@
;; A closing brace is 1 level unindended
((looking-at "}") (- baseline rust-indent-offset))
+ ;;Line up method chains by their .'s
+ ((when (and rust-indent-method-chain
+ (looking-at "\..+\(.*\);?\n"))
+ (or
+ (let ((method-indent
(rust-align-to-method-chain)))
+ (when method-indent
+ (+ method-indent rust-indent-offset)))
+ (+ baseline rust-indent-offset))))
+
+
;; Doc comments in /** style with leading * indent to line up
the *s
((and (nth 4 (syntax-ppss)) (looking-at "*"))
(+ 1 baseline))
- [nongnu] elpa/rust-mode ef048b3 082/486: emacs: highlight `#[foo = "bar"]` attributes, (continued)
- [nongnu] elpa/rust-mode ef048b3 082/486: emacs: highlight `#[foo = "bar"]` attributes, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode d4264a9 065/486: extern mod => extern crate, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f3c784f 083/486: Update repo location, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 0617f1c 078/486: Recommend autoload instead of require, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode a8fad0f 085/486: emacs: Don't overwrite font lock for attributes, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 9c94ec4 079/486: auto merge of #13922 : Rufflewind/rust/patch-1, r=pnkfelix, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode b2c9e05 069/486: Emacs: indent relative to enclosing block, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 336c052 087/486: emacs: Remove outdated references to ~ in tests, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 8622310 091/486: Add 'move' keyword to emacs, kate, and vim editor modes., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4ccac8e 095/486: Update editor syntax files for isize/usize., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 2a81393 094/486: added optional method chain indentations for emacs major mode,
ELPA Syncer <=
- [nongnu] elpa/rust-mode 079f0c2 093/486: Update emacs and vi modes., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 0b9a7e0 092/486: rust-mode.el: Tweak syntax table, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 67f4832 099/486: Fix tests broken by trailing whitespace removal, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f292554 097/486: Changed rust-mode code for tabs -> spaces, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 4659aee 098/486: rollup merge of #19913: KOMON/rust-mode-emacs-indentation, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode e6e16cc 102/486: Add test for closing braces in character literals, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 66438d4 108/486: Merge pull request #2 from MicahChalmer/fix-quotes-with-syntax-properties, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode f0d4c25 109/486: Fix aligning of method chains (more-or-less) and add various unit tests., ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode fd92bfd 111/486: Merge pull request #17 from ramnes/master, ELPA Syncer, 2021/08/07
- [nongnu] elpa/rust-mode 149cfdd 106/486: Merge pull request #20 from pnkfelix/fix-broken-tests, ELPA Syncer, 2021/08/07