[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 5e3ab8c 139/496: Apply swift-indent-multiline-s
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 5e3ab8c 139/496: Apply swift-indent-multiline-statement-offset to the multi-line |
Date: |
Sun, 29 Aug 2021 11:33:23 -0400 (EDT) |
branch: elpa/swift-mode
commit 5e3ab8cd253bc5311475833532342285f3e8c21b
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Apply swift-indent-multiline-statement-offset to the multi-line
statements with hanging operator
---
swift-mode.el | 6 ++++++
test/indentation-tests.el | 10 ++++++++++
2 files changed, 16 insertions(+)
diff --git a/swift-mode.el b/swift-mode.el
index 4561d38..f16fbe9 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -280,6 +280,12 @@
(looking-back "[ \t\n]" 1 t))
(smie-rule-parent swift-indent-multiline-statement-offset)))
+ ;; Apply swift-indent-multiline-statement-offset if
+ ;; operator is the last symbol on the line
+ (`(:before . "OP")
+ (if (looking-at ".[\n]")
+ (smie-rule-parent swift-indent-multiline-statement-offset)))
+
(`(:before . "if")
(if (smie-rule-prev-p "else")
(if (smie-rule-parent-p "{")
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index fd3d30c..f958732 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -850,6 +850,16 @@ let json_ary = NSJSONSerialization
"
((swift-indent-multiline-statement-offset 4)))
+(check-indentation indents-multiline-expressions-to-user-defined-offset/4
+ "
+let options = NSRegularExpressionOptions.CaseInsensitive &
+|NSRegularExpressionOptions.DotMatchesLineSeparators
+" "
+let options = NSRegularExpressionOptions.CaseInsensitive &
+ |NSRegularExpressionOptions.DotMatchesLineSeparators
+"
+((swift-indent-multiline-statement-offset 4)))
+
(check-indentation indents-type-annotations/1
"
typealias Foo = Bar<Foo.Baz, Foo>
- [nongnu] elpa/swift-mode 8fc94c7 097/496: Merge pull request #25 from ap4y/smie_indentation, (continued)
- [nongnu] elpa/swift-mode 8fc94c7 097/496: Merge pull request #25 from ap4y/smie_indentation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 889586c 102/496: Merge pull request #28 from ap4y/highlight_interpolation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0fcf3ab 115/496: Restructure test for multi-line hash in method call to test against case, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode b0f5d13 113/496: Make commas non sticky, fixes indentation issues with optionals and, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d77b2df 122/496: Enable nested flag 'n' for C-style multi-line comments, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode b43c1e2 129/496: Merge pull request #38 from ap4y/fix_36, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a028f68 127/496: Add "_" to the allowed symbols in string interpolation expression, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2593659 131/496: Improve indentation for multi-line dot expression with dot positioned on, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 835c3d3 132/496: Merge pull request #40 from ap4y/improve_37, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2eb3952 136/496: Merge pull request #45 from ap4y/dot_in_string_interpolation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5e3ab8c 139/496: Apply swift-indent-multiline-statement-offset to the multi-line,
ELPA Syncer <=
- [nongnu] elpa/swift-mode 4e615b7 143/496: Merge pull request #50 from ap4y/string_interpolation_all_op, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 9c716c1 155/496: Update README, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 1753f23 149/496: Merge pull request #53 from ap4y/improve_smie_dot_exp_rule, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 8492a3d 157/496: Update copyright, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c8cdb81 153/496: Shortcut linked sources flycheck logic when corresponding variable is nil, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a3caf1d 163/496: Change '_' character class to 'symbol constituent', ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0ad5865 171/496: Merge pull request #71 from ap4y/access_modifiers_font_lock, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 69289fe 180/496: Lexer improvement: don't use implicit semicolon when ":" and "?" token, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7a7038b 202/496: Remove supported for trailing dot in multi-line expression (invalid, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d27b851 181/496: Add indentation rules for ternary operator, ELPA Syncer, 2021/08/29