[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode cdf7ad4 220/496: Fix indentation issues with de
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode cdf7ad4 220/496: Fix indentation issues with deep nested if cluase |
Date: |
Sun, 29 Aug 2021 11:33:39 -0400 (EDT) |
branch: elpa/swift-mode
commit cdf7ad49e332546f644296f7f8d41e44d6e8639c
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Fix indentation issues with deep nested if cluase
---
swift-mode.el | 10 +++-----
test/indentation-tests.el | 62 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 6 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index c5412fb..65796e4 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -159,14 +159,12 @@
(for-head (in-exp) (op-exp) (for-head ";" for-head))
- (conditional (exp) (let-decl))
- (if-body ("if" conditional "{" insts "}"))
- (if-else-if (if-body) (if-else-if "else" if-else-if))
- (if-clause (if-else-if)))
+ (if-conditional (exp) (let-decl))
+ (if-body ("if" if-conditional "{" insts "}"))
+ (if-clause (if-body) (if-body "else" if-body)))
;; Conflicts
'((nonassoc "{") (assoc ",") (assoc ";") (assoc ":") (right "="))
'((assoc "in") (assoc "where") (assoc "OP"))
- '((assoc "else"))
'((assoc ";") (assoc "ecase"))
'((assoc "case")))
@@ -359,7 +357,7 @@
(`(:before . "if")
(if (smie-rule-prev-p "else")
(if (smie-rule-parent-p "{")
- swift-indent-offset
+ (smie-rule-parent swift-indent-offset)
(smie-rule-parent))))
;; Disable unnecessary default indentation for
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index 65897e9..2d24fa8 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -1677,6 +1677,68 @@ if a {
}
")
+(check-indentation indent-long-if-else-if/3
+ "
+class Foo {
+ func a() {
+ if a {
+ a
+ } else if b {
+ |a
+ } else if a {
+ a
+ } else {
+ a
+ }
+ }
+}
+" "
+class Foo {
+ func a() {
+ if a {
+ a
+ } else if b {
+ |a
+ } else if a {
+ a
+ } else {
+ a
+ }
+ }
+}
+")
+
+(check-indentation indent-long-if-else-if/4
+ "
+class Foo {
+ func a() {
+ if a {
+ a
+ } else if b {
+ a
+ |} else if a {
+ a
+ } else {
+ a
+ }
+ }
+}
+" "
+class Foo {
+ func a() {
+ if a {
+ a
+ } else if b {
+ a
+ |} else if a {
+ a
+ } else {
+ a
+ }
+ }
+}
+")
+
(check-indentation anonymous-function-as-a-argument/1
"
UIView.animateWithDuration(1.0,
- [nongnu] elpa/swift-mode c664fc2 144/496: Merge pull request #51 from ap4y/fix_default_case_indentation, (continued)
- [nongnu] elpa/swift-mode c664fc2 144/496: Merge pull request #51 from ap4y/fix_default_case_indentation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ce72472 141/496: Make all possible operators allowed in string interpolation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 3298fb1 169/496: Stop overriding user preferences for tab-width., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0808a2b 170/496: Add font-lock rules for access modifier keywords, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 52045f0 174/496: Fix issues with several failing tests on emacs 24.4, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 230afd3 175/496: Setup travis matrix with emacs 24.3 and 24.4., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5fabebd 196/496: Improve indentation rules for function arguments, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 38933b9 208/496: Don't use implicit semicolon when operator is placed on the second line, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d0c65bc 212/496: Fix bug with the closing parentheses in method calls and function, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 107195e 219/496: Improve lexer rule for generics with optional or implicit unwrapping, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode cdf7ad4 220/496: Fix indentation issues with deep nested if cluase,
ELPA Syncer <=
- [nongnu] elpa/swift-mode 9941c27 224/496: Bring failing tests for #81 contributed in #82 by @dougbeal, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4ae6cc2 228/496: Fix indent when after comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 68a3a29 231/496: Support for choosing framework search paths., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 8e0f8d6 240/496: Merge pull request #94 from wiruzx/new-range-operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 17bf117 242/496: Merge pull request #95 from wiruzx/add-as!-operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode b3af0b0 252/496: Constraint all look backs to the reasonable amount of lines, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 52a01b1 269/496: Add test case for backward-sexp, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5c09b07 289/496: Merge pull request #114 from uk-ar/fix-indent-for-ternary-operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4e9da69 299/496: Release 0.4.0, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c303245 291/496: Merge pull request #115 from uk-ar/add-melpa-badge, ELPA Syncer, 2021/08/29