Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support targeting multiple scopes in a theme with tree sitter #241703

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Support targeting multiple scopes in a theme with tree sitter #241703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea764be
Support targeting multiple scopes in a theme with tree sitter
alexr00 Feb 24, 2025
a2632f3
Fix tests
alexr00 Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 55 additions & 55 deletions extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-241001_ts.json
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-function-inv_ts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
{
"c": "push",
"t": "entity.name.function",
"t": "variable entity.name.function",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
Expand Down Expand Up @@ -57,7 +57,7 @@
},
{
"c": "callback",
"t": "entity.name.function",
"t": "variable entity.name.function",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
Expand Down Expand Up @@ -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",
Expand All @@ -99,7 +99,7 @@
},
{
"c": "Cell",
"t": "entity.name.function",
"t": "new.expr variable entity.name.function",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
Expand All @@ -113,7 +113,7 @@
},
{
"c": "(",
"t": "punctuation",
"t": "new.expr punctuation",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
Expand All @@ -127,7 +127,7 @@
},
{
"c": "row",
"t": "variable",
"t": "new.expr variable",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
Expand All @@ -141,7 +141,7 @@
},
{
"c": ",",
"t": "punctuation.delimiter",
"t": "new.expr punctuation.delimiter",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
Expand All @@ -155,7 +155,7 @@
},
{
"c": "col",
"t": "variable",
"t": "new.expr variable",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
Expand All @@ -169,7 +169,7 @@
},
{
"c": ",",
"t": "punctuation.delimiter",
"t": "new.expr punctuation.delimiter",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
Expand All @@ -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",
Expand All @@ -197,7 +197,7 @@
},
{
"c": ")",
"t": "punctuation",
"t": "new.expr punctuation",
"r": {
"dark_plus": "default: #D4D4D4",
"light_plus": "default: #000000",
Expand Down
40 changes: 20 additions & 20 deletions extensions/vscode-colorize-tests/test/colorize-tree-sitter-results/test-issue11_ts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@
},
{
"c": "?",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -1569,7 +1569,7 @@
},
{
"c": ":",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -1639,7 +1639,7 @@
},
{
"c": "?",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -1667,7 +1667,7 @@
},
{
"c": ":",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -1947,7 +1947,7 @@
},
{
"c": ":",
"t": "keyword.operator.type.annotation",
"t": "punctuation.delimiter keyword.operator.type.annotation",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2003,7 +2003,7 @@
},
{
"c": "string",
"t": "support.type.primitive",
"t": "support.type support.type.primitive",
"r": {
"dark_plus": "support.type: #4EC9B0",
"light_plus": "support.type: #267F99",
Expand Down Expand Up @@ -2199,7 +2199,7 @@
},
{
"c": "foo",
"t": "entity.name.function",
"t": "variable entity.name.function",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
Expand Down Expand Up @@ -2381,7 +2381,7 @@
},
{
"c": ":",
"t": "keyword.operator.type.annotation",
"t": "punctuation.delimiter keyword.operator.type.annotation",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2437,7 +2437,7 @@
},
{
"c": "param",
"t": "variable.parameter",
"t": "variable variable.parameter",
"r": {
"dark_plus": "variable: #9CDCFE",
"light_plus": "variable: #001080",
Expand All @@ -2451,7 +2451,7 @@
},
{
"c": "?",
"t": "keyword.operator.optional",
"t": "punctuation.delimiter keyword.operator.optional",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand All @@ -2465,7 +2465,7 @@
},
{
"c": ":",
"t": "keyword.operator.type.annotation",
"t": "punctuation.delimiter keyword.operator.type.annotation",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand All @@ -2479,7 +2479,7 @@
},
{
"c": "number",
"t": "support.type.primitive",
"t": "support.type support.type.primitive",
"r": {
"dark_plus": "support.type: #4EC9B0",
"light_plus": "support.type: #267F99",
Expand Down Expand Up @@ -2521,7 +2521,7 @@
},
{
"c": "void",
"t": "support.type.primitive",
"t": "support.type support.type.primitive",
"r": {
"dark_plus": "support.type: #4EC9B0",
"light_plus": "support.type: #267F99",
Expand Down Expand Up @@ -2619,7 +2619,7 @@
},
{
"c": ":",
"t": "keyword.operator.type.annotation",
"t": "punctuation.delimiter keyword.operator.type.annotation",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2675,7 +2675,7 @@
},
{
"c": "|",
"t": "keyword.operator.type",
"t": "keyword.operator keyword.operator.type",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2731,7 +2731,7 @@
},
{
"c": "&",
"t": "keyword.operator.type",
"t": "keyword.operator keyword.operator.type",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2913,7 +2913,7 @@
},
{
"c": "?",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -2941,7 +2941,7 @@
},
{
"c": ":",
"t": "keyword.operator.ternary",
"t": "punctuation.delimiter keyword.operator.ternary",
"r": {
"dark_plus": "keyword.operator: #D4D4D4",
"light_plus": "keyword.operator: #000000",
Expand Down Expand Up @@ -3067,7 +3067,7 @@
},
{
"c": "foo",
"t": "entity.name.function",
"t": "variable entity.name.function",
"r": {
"dark_plus": "entity.name.function: #DCDCAA",
"light_plus": "entity.name.function: #795E26",
Expand Down Expand Up @@ -3095,7 +3095,7 @@
},
{
"c": "string",
"t": "support.type.primitive",
"t": "support.type support.type.primitive",
"r": {
"dark_plus": "support.type: #4EC9B0",
"light_plus": "support.type: #267F99",
Expand Down
Loading
Loading