[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 2593659 131/496: Improve indentation for multi-
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 2593659 131/496: Improve indentation for multi-line dot expression with dot positioned on |
Date: |
Sun, 29 Aug 2021 11:33:22 -0400 (EDT) |
branch: elpa/swift-mode
commit 25936592b04de9d425ad4ee17a5c52691069ac4a
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Improve indentation for multi-line dot expression with dot positioned on
the second line
---
swift-mode.el | 2 +-
test/indentation-tests.el | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/swift-mode.el b/swift-mode.el
index bc96468..adea3e9 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -187,7 +187,7 @@
(defun swift-smie--implicit-semi-p ()
(save-excursion
(not (or (memq (char-before) '(?\{ ?\[ ?, ?.))
- (memq (char-after (+(point) 1)) '(?.))
+ (looking-at "[ \n\t]+[.]")
(looking-back swift-smie--operators-regexp (- (point) 3) t)
))))
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index 3b1c14f..d5dc4b4 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -792,6 +792,24 @@ let json_ary = NSJSONSerialization
|.JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
")
+(check-indentation indents-multiline-expressions/6
+ "
+let json_ary = NSJSONSerialization.
+ |JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
+" "
+let json_ary = NSJSONSerialization.
+ |JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
+")
+
+(check-indentation indents-multiline-expressions/7
+ "
+let json_ary = NSJSONSerialization
+ |.JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
+" "
+let json_ary = NSJSONSerialization
+ |.JSONObjectWithData(data, options: nil, error: &json_err) as
NSArray
+")
+
(check-indentation indents-type-annotations/1
"
typealias Foo = Bar<Foo.Baz, Foo>
- [nongnu] elpa/swift-mode 8dc7eb9 078/496: Clean up after pull request, (continued)
- [nongnu] elpa/swift-mode 8dc7eb9 078/496: Clean up after pull request, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 98b627a 075/496: Add @ap4y to contributors, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 812b4f6 084/496: Remove redundant hook definition, ELPA Syncer, 2021/08/29
- [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 <=
- [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, 2021/08/29
- [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