Skip to content

Commit 79d04dc

Browse files
committed
fix after-comma syntax
Signed-off-by: Qingpeng Li <qingpeng9802@gmail.com>
1 parent 9cdcc96 commit 79d04dc

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"name": "Qingpeng Li",
77
"email": "qingpeng9802@gmail.com"
88
},
9-
"version": "1.2.10",
9+
"version": "1.2.11",
1010
"publisher": "qingpeng",
1111
"engines": {
1212
"vscode": "^1.63.0"

syntaxes/commonlisp.tmLanguage.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,19 +194,19 @@
194194
"constant": {
195195
"patterns": [
196196
{
197-
"match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi|\nnil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float|\nmost-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float|\nmost-negative-long-float|most-negative-fixnum|most-negative-double-float|long-float-negative-epsilon|\nlong-float-epsilon|least-positive-single-float|least-positive-short-float|least-positive-normalized-single-float|\nleast-positive-normalized-short-float|least-positive-normalized-long-float|least-positive-normalized-double-float|\nleast-positive-long-float|least-positive-double-float|least-negative-single-float|least-negative-short-float|\nleast-negative-normalized-single-float|least-negative-normalized-short-float|least-negative-normalized-long-float|\nleast-negative-normalized-double-float|least-negative-long-float|least-negative-double-float|lambda-parameters-limit|\nlambda-list-keywords|internal-time-units-per-second|double-float-negative-epsilon|double-float-epsilon|char-code-limit|\ncall-arguments-limit|boole-xor|boole-set|boole-orc2|boole-orc1|boole-nor|boole-nand|boole-ior|boole-eqv|boole-clr|\nboole-c2|boole-c1|boole-andc2|boole-andc1|boole-and|boole-2|boole-1|array-total-size-limit|array-rank-limit|array-dimension-limit)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
197+
"match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi|\nnil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float|\nmost-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float|\nmost-negative-long-float|most-negative-fixnum|most-negative-double-float|long-float-negative-epsilon|\nlong-float-epsilon|least-positive-single-float|least-positive-short-float|least-positive-normalized-single-float|\nleast-positive-normalized-short-float|least-positive-normalized-long-float|least-positive-normalized-double-float|\nleast-positive-long-float|least-positive-double-float|least-negative-single-float|least-negative-short-float|\nleast-negative-normalized-single-float|least-negative-normalized-short-float|least-negative-normalized-long-float|\nleast-negative-normalized-double-float|least-negative-long-float|least-negative-double-float|lambda-parameters-limit|\nlambda-list-keywords|internal-time-units-per-second|double-float-negative-epsilon|double-float-epsilon|char-code-limit|\ncall-arguments-limit|boole-xor|boole-set|boole-orc2|boole-orc1|boole-nor|boole-nand|boole-ior|boole-eqv|boole-clr|\nboole-c2|boole-c1|boole-andc2|boole-andc1|boole-and|boole-2|boole-1|array-total-size-limit|array-rank-limit|array-dimension-limit)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
198198
"name": "constant.language.commonlisp"
199199
},
200200
{
201-
"match": "(?x)\n(?<=^|\\s|\\() # preceded by space or (\n([+-]?[0-9]+(?:\\/[0-9]+)*| # ratio\n[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?| # integer, float\n(\\#b|\\#B)[01\\/+-]+|(\\#o|\\#O)[0-7\\/+-]+|(\\#x|\\#X)[0-9a-fA-F\\/+-]+|(\\#[0-9]+[rR]?)[0-9a-zA-Z\\/+-]+)\n(?=(\\s|\\))) # followed by space, )",
201+
"match": "(?x)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n([+-]?[0-9]+(?:\\/[0-9]+)*| # ratio\n[-+]?[0-9]*\\.?[0-9]+([eE][-+]?[0-9]+)?| # integer, float\n(\\#b|\\#B)[01\\/+-]+|(\\#o|\\#O)[0-7\\/+-]+|(\\#x|\\#X)[0-9a-fA-F\\/+-]+|(\\#[0-9]+[rR]?)[0-9a-zA-Z\\/+-]+)\n(?=(\\s|\\))) # followed by space, )",
202202
"name": "constant.numeric.commonlisp"
203203
},
204204
{
205-
"match": "(?xi)\n(?<=\\s) # preceded by space or (\n(\\.)\n(?=\\s)",
205+
"match": "(?xi)\n(?<=\\s) # preceded by space\n(\\.)\n(?=\\s)",
206206
"name": "variable.other.constant.dot.commonlisp"
207207
},
208208
{
209-
"match": "(?x)\n(?<=^|\\s|\\() # preceded by space or (\n([+-]?[0-9]*\\.[0-9]*((e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)?|\n[+-]?[0-9]+(\\.[0-9]*)?(e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)\n(?=(\\s|\\))) # followed by space, )",
209+
"match": "(?x)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n([+-]?[0-9]*\\.[0-9]*((e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)?|\n[+-]?[0-9]+(\\.[0-9]*)?(e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)\n(?=(\\s|\\))) # followed by space, )",
210210
"name": "constant.numeric.commonlisp"
211211
}
212212
]
@@ -290,11 +290,11 @@
290290
"variable": {
291291
"patterns": [
292292
{
293-
"match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:\\*trace-output\\*|\\*terminal-io\\*|\\*standard-output\\*|\\*standard-input\\*|\\*readtable\\*|\\*read-suppress\\*|\\*read-eval\\*|\n\\*read-default-float-format\\*|\\*read-base\\*|\\*random-state\\*|\\*query-io\\*|\\*print-right-margin\\*|\\*print-readably\\*|\\*print-radix\\*|\\*print-pretty\\*|\n\\*print-pprint-dispatch\\*|\\*print-miser-width\\*|\\*print-lines\\*|\\*print-level\\*|\\*print-length\\*|\\*print-gensym\\*|\\*print-escape\\*|\\*print-circle\\*|\n\\*print-case\\*|\\*print-base\\*|\\*print-array\\*|\\*package\\*|\\*modules\\*|\\*macroexpand-hook\\*|\\*load-verbose\\*|\\*load-truename\\*|\\*load-print\\*|\n\\*load-pathname\\*|\\*gensym-counter\\*|\\*features\\*|\\*error-output\\*|\\*default-pathname-defaults\\*|\\*debugger-hook\\*|\\*debug-io\\*|\\*compile-verbose\\*|\n\\*compile-print\\*|\\*compile-file-truename\\*|\\*compile-file-pathname\\*|\\*break-on-signals\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
293+
"match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\*trace-output\\*|\\*terminal-io\\*|\\*standard-output\\*|\\*standard-input\\*|\\*readtable\\*|\\*read-suppress\\*|\\*read-eval\\*|\n\\*read-default-float-format\\*|\\*read-base\\*|\\*random-state\\*|\\*query-io\\*|\\*print-right-margin\\*|\\*print-readably\\*|\\*print-radix\\*|\\*print-pretty\\*|\n\\*print-pprint-dispatch\\*|\\*print-miser-width\\*|\\*print-lines\\*|\\*print-level\\*|\\*print-length\\*|\\*print-gensym\\*|\\*print-escape\\*|\\*print-circle\\*|\n\\*print-case\\*|\\*print-base\\*|\\*print-array\\*|\\*package\\*|\\*modules\\*|\\*macroexpand-hook\\*|\\*load-verbose\\*|\\*load-truename\\*|\\*load-print\\*|\n\\*load-pathname\\*|\\*gensym-counter\\*|\\*features\\*|\\*error-output\\*|\\*default-pathname-defaults\\*|\\*debugger-hook\\*|\\*debug-io\\*|\\*compile-verbose\\*|\n\\*compile-print\\*|\\*compile-file-truename\\*|\\*compile-file-pathname\\*|\\*break-on-signals\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
294294
"name": "string.regexp.earmuffsasterisk.commonlisp"
295295
},
296296
{
297-
"match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|\\/\\/\\/|\\/\\/)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
297+
"match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|\\/\\/\\/|\\/\\/)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
298298
"name": "variable.other.repl.commonlisp"
299299
}
300300
]
@@ -537,11 +537,11 @@
537537
}
538538
},
539539
{
540-
"match": "(?xi)\n(?<=\\S:|^|\\s|\\() # preceded by space or (\n(\\+[^\\s\\+]+\\+)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
540+
"match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\+[^\\s\\+]+\\+)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
541541
"name": "variable.other.constant.earmuffsplus.commonlisp"
542542
},
543543
{
544-
"match": "(?xi)\n(?<=\\S:|^|\\s|\\() # preceded by space or (\n(\\*[^\\s\\*]+\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
544+
"match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\*[^\\s\\*]+\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )",
545545
"name": "string.regexp.earmuffsasterisk.commonlisp"
546546
}
547547
]

syntaxes/commonlisp.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ repository:
217217
# CL-ANSI Constant Variable
218218
- match: |-
219219
(?xi)
220-
(?<=^|\s|\() # preceded by space or (
220+
(?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
221221
(?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi|
222222
nil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float|
223223
most-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float|
@@ -240,7 +240,7 @@ repository:
240240
# CL-ANSI 2.4.8.10 Sharpsign R
241241
- match: |-
242242
(?x)
243-
(?<=^|\s|\() # preceded by space or (
243+
(?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
244244
([+-]?[0-9]+(?:\/[0-9]+)*| # ratio
245245
[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?| # integer, float
246246
(\#b|\#B)[01\/+-]+|(\#o|\#O)[0-7\/+-]+|(\#x|\#X)[0-9a-fA-F\/+-]+|(\#[0-9]+[rR]?)[0-9a-zA-Z\/+-]+)
@@ -250,7 +250,7 @@ repository:
250250
# CL-ANSI Dot
251251
- match: |-
252252
(?xi)
253-
(?<=\s) # preceded by space or (
253+
(?<=\s) # preceded by space
254254
(\.)
255255
(?=\s)
256256
name: variable.other.constant.dot.commonlisp
@@ -260,7 +260,7 @@ repository:
260260
# 2.1.3. Floating-Point Numbers https://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node19.html#SECTION00613000000000000000
261261
- match: |-
262262
(?x)
263-
(?<=^|\s|\() # preceded by space or (
263+
(?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
264264
([+-]?[0-9]*\.[0-9]*((e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)?|
265265
[+-]?[0-9]+(\.[0-9]*)?(e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)
266266
(?=(\s|\))) # followed by space, )
@@ -486,7 +486,7 @@ repository:
486486
# Same as Special Variables
487487
- match: |-
488488
(?xi)
489-
(?<=^|\s|\() # preceded by space or (
489+
(?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
490490
(?:\*trace-output\*|\*terminal-io\*|\*standard-output\*|\*standard-input\*|\*readtable\*|\*read-suppress\*|\*read-eval\*|
491491
\*read-default-float-format\*|\*read-base\*|\*random-state\*|\*query-io\*|\*print-right-margin\*|\*print-readably\*|\*print-radix\*|\*print-pretty\*|
492492
\*print-pprint-dispatch\*|\*print-miser-width\*|\*print-lines\*|\*print-level\*|\*print-length\*|\*print-gensym\*|\*print-escape\*|\*print-circle\*|
@@ -499,7 +499,7 @@ repository:
499499
# For Lisp REPL
500500
- match: |-
501501
(?xi)
502-
(?<=^|\s|\() # preceded by space or (
502+
(?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
503503
(?:\*\*\*|\*\*|\+\+\+|\+\+|\/\/\/|\/\/)
504504
(?=(\s|\(|\))) # followed by space, ( or )
505505
name: variable.other.repl.commonlisp
@@ -811,14 +811,14 @@ repository:
811811
# Style Guide: Constants, earmuffs +
812812
- match: |-
813813
(?xi)
814-
(?<=\S:|^|\s|\() # preceded by space or (
814+
(?<=\S:|^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
815815
(\+[^\s\+]+\+)
816816
(?=(\s|\(|\))) # followed by space, ( or )
817817
name: variable.other.constant.earmuffsplus.commonlisp
818818
# Style Guide: Special variables, earmuffs *
819819
- match: |-
820820
(?xi)
821-
(?<=\S:|^|\s|\() # preceded by space or (
821+
(?<=\S:|^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.`
822822
(\*[^\s\*]+\*)
823823
(?=(\s|\(|\))) # followed by space, ( or )
824824
name: string.regexp.earmuffsasterisk.commonlisp

0 commit comments

Comments
 (0)