[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode b0f5d13 113/496: Make commas non sticky, fixes
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode b0f5d13 113/496: Make commas non sticky, fixes indentation issues with optionals and |
Date: |
Sun, 29 Aug 2021 11:33:18 -0400 (EDT) |
branch: elpa/swift-mode
commit b0f5d13232c1ec1cf3d0f786f33224f5ed44d778
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Make commas non sticky, fixes indentation issues with optionals and
implicit unwrapping
---
swift-mode.el | 2 ++
test/indentation-tests.el | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/swift-mode.el b/swift-mode.el
index d094cbf..efea369 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -194,6 +194,7 @@
";")
((looking-at "{") (forward-char 1) "{")
((looking-at "}") (forward-char 1) "}")
+ ((looking-at ",") (forward-char 1) ",")
((looking-at "<") (forward-char 1)
(if (looking-at "[[:upper:]]") "<T" "OP"))
((looking-at ">") (forward-char 1)
@@ -213,6 +214,7 @@
";")
((eq (char-before) ?\{) (backward-char 1) "{")
((eq (char-before) ?\}) (backward-char 1) "}")
+ ((eq (char-before) ?,) (backward-char 1) ",")
((eq (char-before) ?<) (backward-char 1)
(if (looking-at "<[[:upper:]]") "<T" "OP"))
((eq (char-before) ?>) (backward-char 1)
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index 3d35adf..a9bfaf0 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -741,6 +741,24 @@ Foo.bar([
])
")
+(check-indentation indents-multiline-expressions/2
+ "
+Foo.bar(bar!,
+|baz)
+" "
+Foo.bar(bar!,
+ |baz)
+")
+
+(check-indentation indents-multiline-expressions/3
+ "
+Foo.bar(bar?,
+|baz)
+" "
+Foo.bar(bar?,
+ |baz)
+")
+
(check-indentation indents-type-annotations/1
"
typealias Foo = Bar<Foo.Baz, Foo>
- [nongnu] elpa/swift-mode ff32221 068/496: Add font lock tests, (continued)
- [nongnu] elpa/swift-mode ff32221 068/496: Add font lock tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5f97c99 060/496: Add tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c3a0a66 065/496: Fix custom variable types, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a17f9e8 066/496: Rename predicate functions ('?' -> -p), ELPA Syncer, 2021/08/29
- [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 <=
- [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, 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