[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/swift-mode 07780b4 118/496: Merge pull request #30 from ap
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/swift-mode 07780b4 118/496: Merge pull request #30 from ap4y/syntactic_fontification |
Date: |
Sun, 29 Aug 2021 11:33:19 -0400 (EDT) |
branch: elpa/swift-mode
commit 07780b434c37096bed6590bf3ec99553b8c74eb0
Merge: ca6437a 41d38bd
Author: Bozhidar Batsov <bozhidar@batsov.com>
Commit: Bozhidar Batsov <bozhidar@batsov.com>
Merge pull request #30 from ap4y/syntactic_fontification
Clarify syntax table for syntactic fontification.
---
swift-mode.el | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/swift-mode.el b/swift-mode.el
index 4447b58..4f9b4b5 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -546,27 +546,33 @@ You can send text to the REPL process from other buffers
containing source.
;;; Mode definition
-;; HACK: This syntax table is lifted directly from `rust-mode'. There may be
-;; corner cases in the Swift syntax that are not accounted for.
(defvar swift-mode-syntax-table
(let ((table (make-syntax-table)))
;; Operators
- (dolist (i '(?+ ?- ?* ?/ ?& ?| ?^ ?! ?< ?> ?~ ?@))
+ (dolist (i '(?+ ?- ?* ?/ ?& ?| ?^ ?! ?< ?> ?~))
(modify-syntax-entry i "." table))
;; Strings
(modify-syntax-entry ?\" "\"" table)
(modify-syntax-entry ?\\ "\\" table)
- ;; _ is a word-char
- (modify-syntax-entry ?_ "w" table)
+ ;; Additional symbols
+ (modify-syntax-entry ?_ "-" table)
+ (modify-syntax-entry ?: "_" table)
;; Comments
(modify-syntax-entry ?/ ". 124b" table)
(modify-syntax-entry ?* ". 23" table)
(modify-syntax-entry ?\n "> b" table)
- (modify-syntax-entry ?\^m "> b" table)
+
+ ;; Parenthesis, braces and brackets
+ (modify-syntax-entry ?\( "()" table)
+ (modify-syntax-entry ?\) ")(" table)
+ (modify-syntax-entry ?\{ "(}" table)
+ (modify-syntax-entry ?\} "){" table)
+ (modify-syntax-entry ?\[ "(]" table)
+ (modify-syntax-entry ?\] ")[" table)
table))
- [nongnu] elpa/swift-mode c882c70 053/496: Replace `if` exprs with `when` exprs, (continued)
- [nongnu] elpa/swift-mode c882c70 053/496: Replace `if` exprs with `when` exprs, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode d136303 076/496: Adding support for Swift REPL via comint-mode, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 286c4b8 077/496: Merge pull request #21 from ap4y/feature_repl, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode e0fba71 083/496: repl -> REPL, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 48cbf55 088/496: Extend a bit installation instructions for package.el, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 7e77211 087/496: Remove redundant autoload, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode a092adc 091/496: Return default paragraph definitions., ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode c9c1271 089/496: Make flycheck work with multiple sources, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 4ac4ea3 098/496: Add font-lock for declaration expression with destructuring, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 6abb788 121/496: Add keywords header, ELPA Syncer, 2021/08/29
- [nongnu] elpa/swift-mode 07780b4 118/496: Merge pull request #30 from ap4y/syntactic_fontification,
ELPA Syncer <=
- [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, 2021/08/29