From 79d04dc9ca80d98e65c4f28b3d67a24a7829b18f Mon Sep 17 00:00:00 2001 From: Qingpeng Li Date: Sat, 11 May 2024 02:29:42 +0800 Subject: [PATCH] fix after-comma syntax Signed-off-by: Qingpeng Li --- package-lock.json | 4 ++-- package.json | 2 +- syntaxes/commonlisp.tmLanguage.json | 16 ++++++++-------- syntaxes/commonlisp.yaml | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a82b8b..5acf717 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "common-lisp", - "version": "1.2.9", + "version": "1.2.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "common-lisp", - "version": "1.2.9", + "version": "1.2.11", "license": "MIT", "devDependencies": { "@types/js-yaml": "^4.0.9", diff --git a/package.json b/package.json index 9841e17..a649949 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "name": "Qingpeng Li", "email": "qingpeng9802@gmail.com" }, - "version": "1.2.10", + "version": "1.2.11", "publisher": "qingpeng", "engines": { "vscode": "^1.63.0" diff --git a/syntaxes/commonlisp.tmLanguage.json b/syntaxes/commonlisp.tmLanguage.json index 41f7d0d..865fb5d 100644 --- a/syntaxes/commonlisp.tmLanguage.json +++ b/syntaxes/commonlisp.tmLanguage.json @@ -194,19 +194,19 @@ "constant": { "patterns": [ { - "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 )", + "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 )", "name": "constant.language.commonlisp" }, { - "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, )", + "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, )", "name": "constant.numeric.commonlisp" }, { - "match": "(?xi)\n(?<=\\s) # preceded by space or (\n(\\.)\n(?=\\s)", + "match": "(?xi)\n(?<=\\s) # preceded by space\n(\\.)\n(?=\\s)", "name": "variable.other.constant.dot.commonlisp" }, { - "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, )", + "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, )", "name": "constant.numeric.commonlisp" } ] @@ -290,11 +290,11 @@ "variable": { "patterns": [ { - "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 )", + "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 )", "name": "string.regexp.earmuffsasterisk.commonlisp" }, { - "match": "(?xi)\n(?<=^|\\s|\\() # preceded by space or (\n(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|\\/\\/\\/|\\/\\/)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", + "match": "(?xi)\n(?<=^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(?:\\*\\*\\*|\\*\\*|\\+\\+\\+|\\+\\+|\\/\\/\\/|\\/\\/)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", "name": "variable.other.repl.commonlisp" } ] @@ -537,11 +537,11 @@ } }, { - "match": "(?xi)\n(?<=\\S:|^|\\s|\\() # preceded by space or (\n(\\+[^\\s\\+]+\\+)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", + "match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\+[^\\s\\+]+\\+)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", "name": "variable.other.constant.earmuffsplus.commonlisp" }, { - "match": "(?xi)\n(?<=\\S:|^|\\s|\\() # preceded by space or (\n(\\*[^\\s\\*]+\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", + "match": "(?xi)\n(?<=\\S:|^|\\s|\\(|,@|,\\.|,) # preceded by space , ( or `,`|`,@`|`,.`\n(\\*[^\\s\\*]+\\*)\n(?=(\\s|\\(|\\))) # followed by space, ( or )", "name": "string.regexp.earmuffsasterisk.commonlisp" } ] diff --git a/syntaxes/commonlisp.yaml b/syntaxes/commonlisp.yaml index c4ee5aa..fbd624e 100644 --- a/syntaxes/commonlisp.yaml +++ b/syntaxes/commonlisp.yaml @@ -217,7 +217,7 @@ repository: # CL-ANSI Constant Variable - match: |- (?xi) - (?<=^|\s|\() # preceded by space or ( + (?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` (?:t|single-float-negative-epsilon|single-float-epsilon|short-float-negative-epsilon|short-float-epsilon|pi| nil|multiple-values-limit|most-positive-single-float|most-positive-short-float|most-positive-long-float| most-positive-fixnum|most-positive-double-float|most-negative-single-float|most-negative-short-float| @@ -240,7 +240,7 @@ repository: # CL-ANSI 2.4.8.10 Sharpsign R - match: |- (?x) - (?<=^|\s|\() # preceded by space or ( + (?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` ([+-]?[0-9]+(?:\/[0-9]+)*| # ratio [-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?| # integer, float (\#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: # CL-ANSI Dot - match: |- (?xi) - (?<=\s) # preceded by space or ( + (?<=\s) # preceded by space (\.) (?=\s) name: variable.other.constant.dot.commonlisp @@ -260,7 +260,7 @@ repository: # 2.1.3. Floating-Point Numbers https://www.cs.cmu.edu/Groups/AI/html/cltl/clm/node19.html#SECTION00613000000000000000 - match: |- (?x) - (?<=^|\s|\() # preceded by space or ( + (?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` ([+-]?[0-9]*\.[0-9]*((e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+)?| [+-]?[0-9]+(\.[0-9]*)?(e|s|f|d|l|E|S|F|D|L)[+-]?[0-9]+) (?=(\s|\))) # followed by space, ) @@ -486,7 +486,7 @@ repository: # Same as Special Variables - match: |- (?xi) - (?<=^|\s|\() # preceded by space or ( + (?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` (?:\*trace-output\*|\*terminal-io\*|\*standard-output\*|\*standard-input\*|\*readtable\*|\*read-suppress\*|\*read-eval\*| \*read-default-float-format\*|\*read-base\*|\*random-state\*|\*query-io\*|\*print-right-margin\*|\*print-readably\*|\*print-radix\*|\*print-pretty\*| \*print-pprint-dispatch\*|\*print-miser-width\*|\*print-lines\*|\*print-level\*|\*print-length\*|\*print-gensym\*|\*print-escape\*|\*print-circle\*| @@ -499,7 +499,7 @@ repository: # For Lisp REPL - match: |- (?xi) - (?<=^|\s|\() # preceded by space or ( + (?<=^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` (?:\*\*\*|\*\*|\+\+\+|\+\+|\/\/\/|\/\/) (?=(\s|\(|\))) # followed by space, ( or ) name: variable.other.repl.commonlisp @@ -811,14 +811,14 @@ repository: # Style Guide: Constants, earmuffs + - match: |- (?xi) - (?<=\S:|^|\s|\() # preceded by space or ( + (?<=\S:|^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` (\+[^\s\+]+\+) (?=(\s|\(|\))) # followed by space, ( or ) name: variable.other.constant.earmuffsplus.commonlisp # Style Guide: Special variables, earmuffs * - match: |- (?xi) - (?<=\S:|^|\s|\() # preceded by space or ( + (?<=\S:|^|\s|\(|,@|,\.|,) # preceded by space , ( or `,`|`,@`|`,.` (\*[^\s\*]+\*) (?=(\s|\(|\))) # followed by space, ( or ) name: string.regexp.earmuffsasterisk.commonlisp