From 03b45bc07785560db0b661b9ce9afb72bb40074f Mon Sep 17 00:00:00 2001 From: Alex Ross <38270282+alexr00@users.noreply.github.com> Date: Wed, 19 Feb 2025 15:19:43 +0100 Subject: [PATCH 1/2] Fix font styles and a bunch of missing typescript scopes for tree sitter Fixes #241001 --- .../languages/highlights/typescript.scm | 38 ++++++++++++++++--- .../services/themes/common/colorThemeData.ts | 3 +- .../browser/treeSitterCodeEditors.ts | 1 + 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/common/languages/highlights/typescript.scm b/src/vs/editor/common/languages/highlights/typescript.scm index dcc10c400ab2c..5e36868e5bee6 100644 --- a/src/vs/editor/common/languages/highlights/typescript.scm +++ b/src/vs/editor/common/languages/highlights/typescript.scm @@ -72,6 +72,12 @@ left: (identifier) @entity.name.function right: [(function_expression) (arrow_function)]) +(required_parameter + (identifier) @variable.parameter) + +(optional_parameter + (identifier) @variable.parameter) + ; Function and method calls (call_expression @@ -86,6 +92,8 @@ function: (member_expression property: (property_identifier) @entity.name.function)) +(new_expression) @new.expr + (new_expression constructor: (identifier) @entity.name.function) @@ -93,7 +101,7 @@ ; Special identifiers (predefined_type) @support.type -(predefined_type (["string" "boolean" "number" "any"])) @support.type.primitive +(predefined_type (["string" "boolean" "number" "any" "unknown"])) @support.type.primitive (type_identifier) @entity.name.type ([ @@ -105,6 +113,9 @@ (extends_clause value: (identifier) @entity.other.inherited-class) +(implements_clause + (type_identifier) @entity.other.inherited-class) + ; Tokens [ @@ -184,6 +195,12 @@ "|" ] @keyword.operator +(union_type + ("|") @keyword.operator.type) + +(intersection_type + ("&") @keyword.operator.type) + [ "{" "}" @@ -202,8 +219,8 @@ "}" @punctuation.definition.template-expression.end) (type_arguments - "<" @punctuation.bracket - ">" @punctuation.bracket) + "<" @punctuation.definition.typeparameters + ">" @punctuation.definition.typeparameters) ; Keywords @@ -296,11 +313,11 @@ (public_field_definition ("?") @keyword.operator.optional) -(optional_parameter) +(optional_parameter ([ "?" ":" - ]) @keyword.operator.optional + ]) @keyword.operator.optional) (ternary_expression ([ @@ -320,8 +337,17 @@ [ (null) +] @constant.language.null + +[ (undefined) -] @constant.language +] @constant.language.undefined + + ((identifier) @constant.language.nan + (#eq? @constant.language.nan "NaN")) + + ((identifier) @constant.language.infinity + (#eq? @constant.language.infinity "Infinity")) [ (true) diff --git a/src/vs/workbench/services/themes/common/colorThemeData.ts b/src/vs/workbench/services/themes/common/colorThemeData.ts index 501b4d54aa4ce..c4eb060a76a76 100644 --- a/src/vs/workbench/services/themes/common/colorThemeData.ts +++ b/src/vs/workbench/services/themes/common/colorThemeData.ts @@ -904,7 +904,8 @@ export function findMetadata(colorThemeData: ColorThemeData, captureNames: strin metadata |= (standardToken << MetadataConsts.TOKEN_TYPE_OFFSET); } - switch (definitions.foreground?.settings.fontStyle) { + const fontStyle = definitions.foreground?.settings.fontStyle || definitions.bold?.settings.fontStyle; + switch (fontStyle) { case 'italic': metadata |= FontStyle.Italic | MetadataConsts.ITALIC_MASK; break; diff --git a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts index 63be06b70a769..777ca784c73e3 100644 --- a/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts +++ b/src/vs/workbench/services/treeSitter/browser/treeSitterCodeEditors.ts @@ -28,6 +28,7 @@ export class TreeSitterCodeEditors extends Disposable { super(); this._register(this._codeEditorService.onCodeEditorAdd(this._onCodeEditorAdd, this)); this._register(this._codeEditorService.onCodeEditorRemove(this._onCodeEditorRemove, this)); + this._codeEditorService.listCodeEditors().forEach(this._onCodeEditorAdd, this); } public async getInitialViewPorts(): Promise { From 52e937fa01adc0e76425c0be52d87b74c13e05f8 Mon Sep 17 00:00:00 2001 From: Alex Ross <38270282+alexr00@users.noreply.github.com> Date: Wed, 19 Feb 2025 15:25:13 +0100 Subject: [PATCH 2/2] Update tests --- .../test-function-inv_ts.json | 26 +- .../test-issue11_ts.json | 162 ++--- .../test-issue5431_ts.json | 18 +- .../test-issue5465_ts.json | 8 +- .../test-issue5566_ts.json | 48 +- .../test-keywords_ts.json | 16 +- .../test-members_ts.json | 42 +- .../test-object-literals_ts.json | 54 +- .../test-strings_ts.json | 10 +- .../colorize-tree-sitter-results/test_ts.json | 658 +++++++++--------- 10 files changed, 521 insertions(+), 521 deletions(-) diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json index 3b81a67cbcd39..cffeb46fdca85 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json @@ -43,7 +43,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -71,7 +71,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -85,7 +85,7 @@ }, { "c": "new", - "t": "keyword.operator.new", + "t": "new.expr keyword.operator.new", "r": { "dark_plus": "keyword.operator.new: #569CD6", "light_plus": "keyword.operator.new: #0000FF", @@ -99,7 +99,7 @@ }, { "c": "Cell", - "t": "variable entity.name.function", + "t": "new.expr variable entity.name.function", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -113,7 +113,7 @@ }, { "c": "(", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -127,7 +127,7 @@ }, { "c": "row", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -141,7 +141,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -155,7 +155,7 @@ }, { "c": "col", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -169,7 +169,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -183,7 +183,7 @@ }, { "c": "false", - "t": "constant.language.boolean.false", + "t": "new.expr constant.language.boolean.false", "r": { "dark_plus": "constant.language: #569CD6", "light_plus": "constant.language: #0000FF", @@ -197,7 +197,7 @@ }, { "c": ")", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -211,7 +211,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -225,7 +225,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json index 06ea46a63c279..71c61dfc5cbb2 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json @@ -85,7 +85,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -113,7 +113,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -183,7 +183,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -295,7 +295,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -309,7 +309,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -323,7 +323,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -379,7 +379,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -547,7 +547,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -603,7 +603,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -771,7 +771,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -827,7 +827,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -995,7 +995,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1051,7 +1051,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1135,7 +1135,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1191,7 +1191,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1303,7 +1303,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1359,7 +1359,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1443,7 +1443,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1541,7 +1541,7 @@ }, { "c": "?", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1569,7 +1569,7 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1583,7 +1583,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1639,7 +1639,7 @@ }, { "c": "?", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1667,7 +1667,7 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -1695,7 +1695,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1947,21 +1947,21 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1975,7 +1975,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2255,7 +2255,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2269,7 +2269,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2381,16 +2381,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -2409,7 +2409,7 @@ }, { "c": "<", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2423,7 +2423,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2437,7 +2437,7 @@ }, { "c": "param", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -2465,16 +2465,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -2493,7 +2493,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2563,7 +2563,7 @@ }, { "c": ">", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2619,16 +2619,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -2647,7 +2647,7 @@ }, { "c": "<", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2675,7 +2675,7 @@ }, { "c": "|", - "t": "keyword.operator", + "t": "keyword.operator keyword.operator.type", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -2731,7 +2731,7 @@ }, { "c": "&", - "t": "keyword.operator", + "t": "keyword.operator keyword.operator.type", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -2759,7 +2759,7 @@ }, { "c": ">", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2857,7 +2857,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2913,7 +2913,7 @@ }, { "c": "?", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -2941,7 +2941,7 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -2969,7 +2969,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3081,7 +3081,7 @@ }, { "c": "<", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3109,7 +3109,7 @@ }, { "c": ">", - "t": "punctuation.bracket", + "t": "punctuation.definition.typeparameters", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3123,7 +3123,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3137,7 +3137,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json index 1d3c369b8260a..bcbec84c66728 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5431_ts.json @@ -29,7 +29,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -43,7 +43,7 @@ }, { "c": "isAll", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -71,7 +71,7 @@ }, { "c": "startTime", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -99,7 +99,7 @@ }, { "c": "endTime", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -113,7 +113,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -197,7 +197,7 @@ }, { "c": "?", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -253,7 +253,7 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -309,7 +309,7 @@ }, { "c": "}", - "t": "string punctuation.definition.template-expression.end punctuation", + "t": "string punctuation punctuation.definition.template-expression.end", "r": { "dark_plus": "punctuation.definition.template-expression.end: #569CD6", "light_plus": "punctuation.definition.template-expression.end: #0000FF", @@ -365,7 +365,7 @@ }, { "c": "}", - "t": "string punctuation.definition.template-expression.end punctuation", + "t": "string punctuation punctuation.definition.template-expression.end", "r": { "dark_plus": "punctuation.definition.template-expression.end: #569CD6", "light_plus": "punctuation.definition.template-expression.end: #0000FF", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json index 4faf6680cd72c..a7feac02ad5ae 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5465_ts.json @@ -43,7 +43,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -57,7 +57,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -183,7 +183,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -239,7 +239,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json index 241236f1c0eca..16bd135e41d56 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue5566_ts.json @@ -29,7 +29,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -43,7 +43,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -113,7 +113,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -127,7 +127,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -141,16 +141,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -183,7 +183,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -253,16 +253,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -323,7 +323,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json index f7b50872f0a80..f484d1f7efc1d 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-keywords_ts.json @@ -57,7 +57,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -71,7 +71,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -99,7 +99,7 @@ }, { "c": "new", - "t": "keyword.operator.new", + "t": "new.expr keyword.operator.new", "r": { "dark_plus": "keyword.operator.new: #569CD6", "light_plus": "keyword.operator.new: #0000FF", @@ -113,7 +113,7 @@ }, { "c": "RegExp", - "t": "variable entity.name.function", + "t": "new.expr variable entity.name.function", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -127,7 +127,7 @@ }, { "c": "(", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -141,7 +141,7 @@ }, { "c": "'", - "t": "string", + "t": "new.expr string", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -155,7 +155,7 @@ }, { "c": "'", - "t": "string", + "t": "new.expr string", "r": { "dark_plus": "string: #CE9178", "light_plus": "string: #A31515", @@ -169,7 +169,7 @@ }, { "c": ")", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json index e34ad5cfbb156..ed55ef2458759 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-members_ts.json @@ -99,16 +99,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -197,7 +197,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -211,7 +211,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -225,16 +225,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -253,7 +253,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json index 966c32e0dee15..27671c9cc2489 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-object-literals_ts.json @@ -71,16 +71,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -113,16 +113,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -169,16 +169,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json index daae4ce1d0bc4..c7fd2b14cfaf6 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-strings_ts.json @@ -99,7 +99,7 @@ }, { "c": "}", - "t": "string punctuation.definition.template-expression.end punctuation", + "t": "string punctuation punctuation.definition.template-expression.end", "r": { "dark_plus": "punctuation.definition.template-expression.end: #569CD6", "light_plus": "punctuation.definition.template-expression.end: #0000FF", @@ -197,7 +197,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -253,7 +253,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -407,7 +407,7 @@ }, { "c": "}", - "t": "string punctuation.definition.template-expression.end punctuation", + "t": "string punctuation punctuation.definition.template-expression.end", "r": { "dark_plus": "punctuation.definition.template-expression.end: #569CD6", "light_plus": "punctuation.definition.template-expression.end: #0000FF", @@ -491,7 +491,7 @@ }, { "c": "}", - "t": "string punctuation.definition.template-expression.end punctuation", + "t": "string punctuation punctuation.definition.template-expression.end", "r": { "dark_plus": "punctuation.definition.template-expression.end: #569CD6", "light_plus": "punctuation.definition.template-expression.end: #0000FF", diff --git a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json index e917d88b9432b..926f880f84b77 100644 --- a/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json +++ b/extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test_ts.json @@ -141,16 +141,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -211,16 +211,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -281,16 +281,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -337,7 +337,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -351,7 +351,7 @@ }, { "c": "row", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -365,16 +365,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -407,7 +407,7 @@ }, { "c": "col", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -421,16 +421,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -463,7 +463,7 @@ }, { "c": "live", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -477,16 +477,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -505,7 +505,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -883,16 +883,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -953,16 +953,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1023,16 +1023,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1093,16 +1093,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1163,16 +1163,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1233,16 +1233,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1303,16 +1303,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1373,16 +1373,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -1471,7 +1471,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1485,7 +1485,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2367,7 +2367,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2381,7 +2381,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2451,7 +2451,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2465,7 +2465,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2535,7 +2535,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2549,7 +2549,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2633,7 +2633,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2647,7 +2647,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2661,7 +2661,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -2675,16 +2675,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -2703,7 +2703,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2843,7 +2843,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2857,7 +2857,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -2997,7 +2997,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3067,7 +3067,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3081,7 +3081,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3095,16 +3095,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -3235,7 +3235,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3249,7 +3249,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3263,7 +3263,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -3277,16 +3277,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -3305,7 +3305,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3417,7 +3417,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3473,7 +3473,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3487,7 +3487,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3543,7 +3543,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3613,7 +3613,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3641,7 +3641,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3725,7 +3725,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3753,7 +3753,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3795,7 +3795,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3837,7 +3837,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3851,7 +3851,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3865,7 +3865,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3949,7 +3949,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -3963,7 +3963,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4047,7 +4047,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4117,7 +4117,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4131,7 +4131,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4145,16 +4145,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -4173,7 +4173,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4285,7 +4285,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4313,7 +4313,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4383,7 +4383,7 @@ }, { "c": "new", - "t": "keyword.operator.new", + "t": "new.expr keyword.operator.new", "r": { "dark_plus": "keyword.operator.new: #569CD6", "light_plus": "keyword.operator.new: #0000FF", @@ -4397,7 +4397,7 @@ }, { "c": "Cell", - "t": "variable entity.name.function", + "t": "new.expr variable entity.name.function", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -4411,7 +4411,7 @@ }, { "c": "(", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4425,7 +4425,7 @@ }, { "c": "cell", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4439,7 +4439,7 @@ }, { "c": ".", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4453,7 +4453,7 @@ }, { "c": "row", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4467,7 +4467,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4481,7 +4481,7 @@ }, { "c": "cell", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4495,7 +4495,7 @@ }, { "c": ".", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4509,7 +4509,7 @@ }, { "c": "col", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4523,7 +4523,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4537,7 +4537,7 @@ }, { "c": "cell", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4551,7 +4551,7 @@ }, { "c": ".", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4565,7 +4565,7 @@ }, { "c": "live", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -4579,7 +4579,7 @@ }, { "c": ")", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4621,7 +4621,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4733,7 +4733,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4859,7 +4859,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4915,7 +4915,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5097,7 +5097,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5111,7 +5111,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -5125,16 +5125,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -5153,7 +5153,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5265,7 +5265,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5447,7 +5447,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5489,7 +5489,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5671,7 +5671,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5713,7 +5713,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5825,7 +5825,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5881,7 +5881,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -5937,7 +5937,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6105,7 +6105,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6119,7 +6119,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6315,7 +6315,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6329,7 +6329,7 @@ }, { "c": "row", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -6343,16 +6343,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -6385,7 +6385,7 @@ }, { "c": "col", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -6399,16 +6399,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -6427,7 +6427,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6469,7 +6469,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6749,7 +6749,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6861,7 +6861,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6889,7 +6889,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6903,7 +6903,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -6931,7 +6931,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7029,7 +7029,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7043,7 +7043,7 @@ }, { "c": "callback", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -7057,7 +7057,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7127,7 +7127,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7141,7 +7141,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7183,7 +7183,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7379,7 +7379,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7449,7 +7449,7 @@ }, { "c": "[", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7463,7 +7463,7 @@ }, { "c": "]", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7505,7 +7505,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7701,7 +7701,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7771,7 +7771,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7799,7 +7799,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7813,7 +7813,7 @@ }, { "c": "new", - "t": "keyword.operator.new", + "t": "new.expr keyword.operator.new", "r": { "dark_plus": "keyword.operator.new: #569CD6", "light_plus": "keyword.operator.new: #0000FF", @@ -7827,7 +7827,7 @@ }, { "c": "Cell", - "t": "variable entity.name.function", + "t": "new.expr variable entity.name.function", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -7841,7 +7841,7 @@ }, { "c": "(", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7855,7 +7855,7 @@ }, { "c": "row", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -7869,7 +7869,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7883,7 +7883,7 @@ }, { "c": "col", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -7897,7 +7897,7 @@ }, { "c": ",", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7911,7 +7911,7 @@ }, { "c": "false", - "t": "constant.language.boolean.false", + "t": "new.expr constant.language.boolean.false", "r": { "dark_plus": "constant.language: #569CD6", "light_plus": "constant.language: #0000FF", @@ -7925,7 +7925,7 @@ }, { "c": ")", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7939,7 +7939,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -7953,7 +7953,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8037,7 +8037,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8065,7 +8065,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8191,7 +8191,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8205,7 +8205,7 @@ }, { "c": "cell", - "t": "variable", + "t": "variable variable.parameter", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -8219,16 +8219,16 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional", + "t": "punctuation.delimiter", "r": { - "dark_plus": "keyword.operator: #D4D4D4", - "light_plus": "keyword.operator: #000000", - "dark_vs": "keyword.operator: #D4D4D4", - "light_vs": "keyword.operator: #000000", - "hc_black": "keyword.operator: #D4D4D4", - "dark_modern": "keyword.operator: #D4D4D4", - "hc_light": "keyword.operator: #000000", - "light_modern": "keyword.operator: #000000" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF", + "dark_modern": "default: #CCCCCC", + "hc_light": "default: #292929", + "light_modern": "default: #3B3B3B" } }, { @@ -8247,7 +8247,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8289,7 +8289,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8373,7 +8373,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -8765,7 +8765,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9101,7 +9101,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9255,7 +9255,7 @@ }, { "c": "?", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -9311,7 +9311,7 @@ }, { "c": ":", - "t": "punctuation.delimiter keyword.operator.optional keyword.operator.ternary", + "t": "punctuation.delimiter keyword.operator.ternary", "r": { "dark_plus": "keyword.operator: #D4D4D4", "light_plus": "keyword.operator: #000000", @@ -9451,7 +9451,7 @@ }, { "c": "(", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9787,7 +9787,7 @@ }, { "c": ")", - "t": "", + "t": "punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9899,7 +9899,7 @@ }, { "c": "new", - "t": "keyword.operator.new", + "t": "new.expr keyword.operator.new", "r": { "dark_plus": "keyword.operator.new: #569CD6", "light_plus": "keyword.operator.new: #0000FF", @@ -9913,7 +9913,7 @@ }, { "c": "Conway", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -9927,7 +9927,7 @@ }, { "c": ".", - "t": "punctuation.delimiter", + "t": "new.expr punctuation.delimiter", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9941,7 +9941,7 @@ }, { "c": "GameOfLife", - "t": "variable", + "t": "new.expr variable", "r": { "dark_plus": "variable: #9CDCFE", "light_plus": "variable: #001080", @@ -9955,7 +9955,7 @@ }, { "c": "(", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -9969,7 +9969,7 @@ }, { "c": ")", - "t": "", + "t": "new.expr punctuation", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000",