[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode a60e3fa 209/496: Don't indent chain of operator
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode a60e3fa 209/496: Don't indent chain of operators multiple times |
Date: |
Sun, 29 Aug 2021 11:33:37 -0400 (EDT) |
branch: elpa/swift-mode
commit a60e3fa5fa87ccbbd8fa91ed0a4ef049941b9b12
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Don't indent chain of operators multiple times
---
swift-mode.el | 3 ++-
test/indentation-tests.el | 26 ++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/swift-mode.el b/swift-mode.el
index 2bedbd9..1666781 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -344,7 +344,8 @@
;; Apply swift-indent-multiline-statement-offset if
;; operator is the last symbol on the line
(`(:before . "OP")
- (when (smie-rule-hanging-p)
+ (when (and (smie-rule-hanging-p)
+ (not (smie-rule-parent-p "OP")))
(if (smie-rule-parent-p "{")
(+ swift-indent-offset swift-indent-multiline-statement-offset)
swift-indent-multiline-statement-offset)))
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index 9a63dfb..0b881f9 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -1174,6 +1174,32 @@ let x = foo ??
|bar
")
+(check-indentation indents-multiline-expressions/21
+ "
+let foo = a +
+ b +
+ |c +
+ d
+" "
+let foo = a +
+ b +
+ |c +
+ d
+")
+
+(check-indentation indents-multiline-expressions/22
+ "
+let foo = a +
+ b +
+ c +
+ |d
+" "
+let foo = a +
+ b +
+ c +
+ |d
+")
+
(check-indentation indents-long-parameters/1
"
func foo() {
- [nongnu] elpa/swift-mode 4b6d6f1 162/496: Add ckruse to the Acknowledgements in README, (continued)
- [nongnu] elpa/swift-mode 4b6d6f1 162/496: Add ckruse to the Acknowledgements in README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5675e1f 167/496: Merge pull request #65 from ckruse/fix_64, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 94d687d 173/496: Add required ELPA source, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 302e83d 194/496: Distinct generic type parameter from ">" operator when checking for, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 73cdda9 195/496: Don't put implicit semicolon after "(", ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5c31636 200/496: Treat default token as case token, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4ab5f7f 201/496: Add implicit semicolon rule for ?? operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fd228c0 203/496: Improve lexer rule for disctinction between case in switch and enum, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 1122ab9 204/496: Add grammar rule for return statement in function, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode f193a82 205/496: defcustom types for swift-indent was incorrectly set to intergerp, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a60e3fa 209/496: Don't indent chain of operators multiple times,
ELPA Syncer <=
- [nongnu] elpa/swift-mode e539ba6 215/496: Improve support for the multi-line case statements, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 95e753b 226/496: Disable testing against emacs 24.3, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e898e7e 234/496: Merge pull request #91 from uk-ar/fix-indent-with-hanging-operator-after-comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a1d7a06 236/496: Merge pull request #88 from uk-ar/fix-indent-after-comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fd9ed20 244/496: Modify indents around comma to meet Xcode spec, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5e7d1b9 250/496: Update swift-mode.el, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a2c0b6a 251/496: Merge pull request #98 from akoaysigod/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7709e04 256/496: Fix token for DECSPEC, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7169a3b 265/496: Fix class when empty (no insts), ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 391752f 272/496: Add test case for forward-list & backward-list, ELPA Syncer, 2021/08/29