[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 1c4253b 191/496: Improve indentation for nested
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 1c4253b 191/496: Improve indentation for nested hash/array statements |
Date: |
Sun, 29 Aug 2021 11:33:34 -0400 (EDT) |
branch: elpa/swift-mode
commit 1c4253bcb322d348af609953e05a7593e4c0e010
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Improve indentation for nested hash/array statements
---
swift-mode.el | 6 ++++--
test/indentation-tests.el | 48 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index 3626fc6..9425fce 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -343,8 +343,10 @@
(`(:before . "(")
(if (smie-rule-next-p "[") (smie-rule-parent)))
(`(:before . "[")
- (if (smie-rule-prev-p "->") swift-indent-offset
- (smie-rule-parent)))
+ (cond
+ ((smie-rule-prev-p "->") swift-indent-offset)
+ ((smie-rule-parent-p "[") swift-indent-offset)
+ (t (smie-rule-parent))))
(`(:after . "->") swift-indent-offset)
;; Normalize behaviour with and without declaration specifier
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index c6a493d..03cbdd5 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -914,6 +914,54 @@ var result = Dictionary<String, V>()
var result = Dictionary<String, V>()
|foo
")
+(check-indentation indents-declaration/8
+ "
+let foo =
+|bar
+" "
+let foo =
+ |bar
+")
+
+(check-indentation indents-declaration/9
+ "
+let foo: Foo? =
+|bar
+" "
+let foo: Foo? =
+ |bar
+")
+
+(check-indentation indents-declaration/10
+ "
+let foo: Foo<A> =
+|bar
+" "
+let foo: Foo<A> =
+ |bar
+")
+
+(check-indentation indents-declaration/11
+ "
+let foo = [
+ foo:
+|bar
+]
+" "
+let foo = [
+ foo:
+ |bar
+]
+")
+
+(check-indentation indents-declaration/12
+ "
+let foo = [
+|[
+" "
+let foo = [
+ |[
+")
(check-indentation indents-multiline-expressions/1
"
- [nongnu] elpa/swift-mode 07780b4 118/496: Merge pull request #30 from ap4y/syntactic_fontification, (continued)
- [nongnu] elpa/swift-mode 07780b4 118/496: Merge pull request #30 from ap4y/syntactic_fontification, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 18ea989 134/496: Merge pull request #42 from ap4y/customizable_multiline_dot_statement, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d42c53c 147/496: Use semantic smie function instead of regex for multi-line dot, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 34f0c95 152/496: Correct source argument extraction in flycheck checker, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 773219a 142/496: Treat default clause for case statement as a whole with colon in bnf, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d7b13b0 150/496: Convert targeted sdk flycheck option from list to string, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode b0fea47 168/496: Fix eval-after-load problems when byte-compiled., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e859716 176/496: Merge pull request #75 from ap4y/test_against_24_4, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode f2b923e 178/496: Improve case statement grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 75aa277 188/496: Add separate lexer rule for return type arrow symbol "->", prevent, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 1c4253b 191/496: Improve indentation for nested hash/array statements,
ELPA Syncer <=
- [nongnu] elpa/swift-mode ebc60c8 197/496: Make closure block in function argument close at the offset 0, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4bdbc23 211/496: Normalize indentation for function declration with argument list on the, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode cf219aa 217/496: Improve indentation of the nested arrays and dictionaries, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 655bd60 229/496: Fix indent in trailing closure, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a2f5b33 233/496: Fix indent when operator hanging after comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 69783af 243/496: added guard statement, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode f94e437 259/496: Fix wrong offset for multiline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e5f28f8 268/496: Fix case-: for default, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 63eae17 001/496: Initial commit, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fdc576f 019/496: Fix for older Emacs(< 24.3), ELPA Syncer, 2021/08/29