[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 782378c 214/496: Correct regex in lexer for the
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 782378c 214/496: Correct regex in lexer for the "default" keyword |
Date: |
Sun, 29 Aug 2021 11:33:38 -0400 (EDT) |
branch: elpa/swift-mode
commit 782378c97d235a9031cdac79fa43a842008b7564
Author: ap4y <lod@pisem.net>
Commit: ap4y <lod@pisem.net>
Correct regex in lexer for the "default" keyword
---
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 420bb09..04be414 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -254,7 +254,7 @@
((looking-at swift-smie--access-modifier-regexp)
(goto-char (match-end 0)) "ACCESSMOD")
- ((looking-at "default")
+ ((looking-at "\\<default\\>")
(goto-char (match-end 0)) "case")
(t (let ((tok (smie-default-forward-token)))
@@ -297,7 +297,7 @@
((looking-back swift-smie--access-modifier-regexp (- (point) 8) t)
(goto-char (match-beginning 0)) "ACCESSMOD")
- ((looking-back "default" (- (point) 7) t)
+ ((looking-back "\\<default\\>" (- (point) 9) t)
(goto-char (match-beginning 0)) "case")
(t (let ((tok (smie-default-backward-token)))
diff --git a/test/indentation-tests.el b/test/indentation-tests.el
index d9816cc..bbea69c 100644
--- a/test/indentation-tests.el
+++ b/test/indentation-tests.el
@@ -1200,6 +1200,17 @@ let foo = a +
|d
")
+(check-indentation indents-multiline-expressions/23
+ "
+let x = bar
+ .buz() ??
+|defaultValue
+" "
+let x = bar
+ .buz() ??
+ |defaultValue
+")
+
(check-indentation indents-long-parameters/1
"
func foo() {
- [nongnu] elpa/swift-mode 88a83ad 145/496: Apply DECSPEC token class only for functions, (continued)
- [nongnu] elpa/swift-mode 88a83ad 145/496: Apply DECSPEC token class only for functions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fc009b5 069/496: Add font locking for indentation tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ae32a8b 071/496: Add basic imenu support, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d02e2dc 024/496: Update contributors, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode fc64626 156/496: Merge pull request #56 from ap4y/fix_flycheck_issues, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 9cf667c 159/496: Start work on 0.4, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode cba4538 161/496: Merge pull request #61 from ckruse/fix_55, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 5611c0f 164/496: Updated syntax: a lot of attributes moved to keywords, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 250e8e4 172/496: Merge pull request #67 from jmibanez/fix-flycheck-and-byte-compilation-bug, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a6267eb 189/496: Improve indentation for the function definitions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 782378c 214/496: Correct regex in lexer for the "default" keyword,
ELPA Syncer <=
- [nongnu] elpa/swift-mode c38b721 216/496: Support default values for arguments in function declaration, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 2cb54c9 222/496: Make grammar for if statement a bit more precise, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode b6bad10 225/496: Set minimum required version to 24.4, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4a27477 230/496: Merge pull request #89 from uk-ar/fix-indent-in-trailing-closure, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4289bd7 235/496: Fix implicit semicolon rule, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a29398b 239/496: Fix half-open range operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7f25806 241/496: Add as! operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 86339ed 247/496: Fix curly bracket's syntax table to enable electric-pair, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 37cab39 263/496: Improve indentation for switch and class statements, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode cb7ba6f 245/496: Add an option for indent after hanging comma, ELPA Syncer, 2021/08/29