[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode e168b34 128/496: Don't use implicit semicolon f
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode e168b34 128/496: Don't use implicit semicolon for multi-line dot expressions |
Date: |
Sun, 29 Aug 2021 11:33:21 -0400 (EDT) |
branch: elpa/swift-mode
commit e168b3490305e265a7332346ceb427f1b78aa309
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Don't use implicit semicolon for multi-line dot expressions
---
swift-mode.el | 3 ++-
test/indentation-tests.el | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/swift-mode.el b/swift-mode.el
index dd93a34..bbf82c4 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -186,7 +186,8 @@
(defun swift-smie--implicit-semi-p ()
(save-excursion
- (not (or (memq (char-before) '(?\{ ?\[ ?\,))
+ (not (or (memq (char-before) '(?\{ ?\[ ?, ?.))
+ (memq (char-after (+(point) 1)) '(?.))
(looking-back swift-smie--operators-regexp (- (point) 3) t)
))))
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index 5f4d394..3b1c14f 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -774,6 +774,24 @@ Foo.bar(bar?,
|baz)
")
+(check-indentation indents-multiline-expressions/4
+ "
+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/5
+ "
+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 41d38bd 117/496: Clarify syntax table for syntactic fontification., (continued)
- [nongnu] elpa/swift-mode 41d38bd 117/496: Clarify syntax table for syntactic fontification., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 18e1e4a 107/496: Highlight attributes as keyword, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 98556c1 120/496: Start work on version 0.3, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 8be19fb 108/496: Highlight self and super as keyword, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 3caacf3 007/496: Highlight attributes and _ wildcards, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c8f1dbd 014/496: Update readme, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode adb3c13 039/496: Restore Emacs 24.1 requirement, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ab5e170 044/496: Add a few links, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a44a755 052/496: Add docstrings for internal indent commands, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 62276c3 061/496: Indent cases in enums, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e168b34 128/496: Don't use implicit semicolon for multi-line dot expressions,
ELPA Syncer <=
- [nongnu] elpa/swift-mode ee83a1d 137/496: Rename swift-indent-multiline-dot-offset to swift-indent-multiline-statement-offset, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fca914a 165/496: Merge pull request #63 from ckruse/updated_syntax, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 8db040e 166/496: fix: underscores are word characters (Word constituents), ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2a21e1b 177/496: Add ternary operator smie grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 641681a 182/496: Fix small typo in comment string, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2b17f71 183/496: Improve grammar and lexer to support access modifier in class definitions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode cac2884 185/496: Add lists to the "type" grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode adfe341 190/496: Add grammar for the protocol definitions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 20134ed 193/496: Use postive lookahead for declaration specifier lexer rule, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c2c3c01 199/496: Improve support for optional types, ELPA Syncer, 2021/08/29