[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 38933b9 208/496: Don't use implicit semicolon w
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 38933b9 208/496: Don't use implicit semicolon when operator is placed on the second line |
Date: |
Sun, 29 Aug 2021 11:33:37 -0400 (EDT) |
branch: elpa/swift-mode
commit 38933b908780f7941b53bedf40476f6c017898d2
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Don't use implicit semicolon when operator is placed on the second line
of multiline expression
---
swift-mode.el | 4 +++-
test/indentation-tests.el | 11 ++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index 96a0b37..2bedbd9 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -218,8 +218,10 @@
(looking-back "[[:space:]][?!]" (- (point) 2) t)
;; ??, is? and as? are operators
(looking-back "[?][?]\\|as[?]\\|is[?]" (- (point) 3) t)
- ;; Leding character in multi-line expression
+ ;; Characters placed on the second line in multi-line expression
(looking-at "[ \n\t]+[.?:]")
+ ;; Operators placed on the second line in multi-line expression
+ (looking-at (concat "[ \n\t]+" swift-smie--operators-regexp))
(and (looking-back swift-smie--operators-regexp (- (point) 3) t)
;; Not a generic type
(not (looking-back "[[:upper:]]>" (- (point) 2) t)))
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index f5abdfd..9a63dfb 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -1156,6 +1156,15 @@ CGPoint(x: aaaaaaaaaaaaaaa.x +
bbbbbbbbbbbbbbbb)
")
+(check-indentation indents-multiline-expressions/19
+ "
+let x = 1
+|+ 1
+" "
+let x = 1
+ |+ 1
+")
+
(check-indentation indents-multiline-expressions/20
"
let x = foo ??
@@ -1275,7 +1284,7 @@ let foo = bar >
" "
1 +
2 + 5 *
- |3
+ |3
"
)
- [nongnu] elpa/swift-mode 699e896 106/496: Start work on the 0.2 series, (continued)
- [nongnu] elpa/swift-mode 699e896 106/496: Start work on the 0.2 series, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 07f6434 111/496: Fix indentation issues with type annotations, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode abd6e07 130/496: Merge pull request #39 from ap4y/fix_37, ELPA Syncer, 2021/08/29
- [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 <=
- [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, 2021/08/29
- [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