[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 1753f23 149/496: Merge pull request #53 from ap
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 1753f23 149/496: Merge pull request #53 from ap4y/improve_smie_dot_exp_rule |
Date: |
Sun, 29 Aug 2021 11:33:26 -0400 (EDT) |
branch: elpa/swift-mode
commit 1753f23b36a0a2f9b1ec4647cae8157300a834c4
Merge: 4286ff9 d42c53c
Author: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Commit: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Merge pull request #53 from ap4y/improve_smie_dot_exp_rule
Use semantic smie function instead of regex for multi-line dot expression
indentation
---
swift-mode.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index 4cce2e1..452ca75 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -275,10 +275,10 @@
;; Apply swift-indent-multiline-statement-offset only if
;; - dot is followed by newline, or
- ;; - have at least one whitespace character before dot
+ ;; - if dot is a first token on the line
(`(:before . ".")
(if (or (looking-at "[.][\n]")
- (looking-back "[ \t\n]" 1 t))
+ (smie-rule-bolp))
(smie-rule-parent swift-indent-multiline-statement-offset)))
;; Apply swift-indent-multiline-statement-offset if
- [nongnu] elpa/swift-mode b0f5d13 113/496: Make commas non sticky, fixes indentation issues with optionals and, (continued)
- [nongnu] elpa/swift-mode b0f5d13 113/496: Make commas non sticky, fixes indentation issues with optionals and, ELPA Syncer, 2021/08/29
- [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 <=
- [nongnu] elpa/swift-mode 8492a3d 157/496: Update copyright, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c8cdb81 153/496: Shortcut linked sources flycheck logic when corresponding variable is nil, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a3caf1d 163/496: Change '_' character class to 'symbol constituent', ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 0ad5865 171/496: Merge pull request #71 from ap4y/access_modifiers_font_lock, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 69289fe 180/496: Lexer improvement: don't use implicit semicolon when ":" and "?" token, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7a7038b 202/496: Remove supported for trailing dot in multi-line expression (invalid, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d27b851 181/496: Add indentation rules for ternary operator, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 3026464 206/496: Merge pull request #79 from dougbeal/fix-custom-types, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode ae4f08b 253/496: Correct implicit semicolon rule for in keyword, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 3aa3dcd 254/496: Add test code for checking tokens, ELPA Syncer, 2021/08/29