godotengine/godot-vscode-plugin
1
0
Fork 0
mirror of https://github.com/godotengine/godot-vscode-plugin.git synced 2025-12-31 13:48:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix various syntax highlighting issues (#674)

Browse Source 
* Fix variable declaration highlighting

* Clean up function call highlighting
This commit is contained in:
David Kincaid
2024-07-02 11:04:22 -07:00
committed by GitHub
parent cca25099c4
commit 9750f8dfc6
3 changed files with 914 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

968
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@@ -885,7 +885,7 @@
"@typescript-eslint/parser": "^5.57.1",
"@vscode/test-cli": "^0.0.4",
"@vscode/test-electron": "^2.3.8",
"@vscode/vsce": "^2.21.0",
"@vscode/vsce": "^2.29.0",
"chai": "^4.3.10",
"esbuild": "^0.17.15",
"eslint": "^8.37.0",
@@ -907,7 +907,7 @@
"vscode-languageclient": "^7.0.0",
"vscode-oniguruma": "^2.0.1",
"vscode-textmate": "^9.0.0",
"ws": "^8.13.0",
"ws": "^8.17.1",
"ya-bbcode": "^4.0.0"
}
}

25
syntaxes/GDScript.tmLanguage.json
View File

@@ -245,7 +245,7 @@
"captures": { "1": { "name": "keyword.control.gdscript" } }
},
"keywords": {
"match": "\\b(?:class|class_name|is|onready|tool|static|export|as|void|enum|preload|assert|breakpoint|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync|trait|namespace)\\b",
"match": "\\b(?:class|class_name|is|onready|tool|static|export|as|void|enum|assert|breakpoint|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync|trait|namespace)\\b",
"name": "keyword.language.gdscript"
},
"letter": {
@@ -281,13 +281,11 @@
]
},
"variable_declaration": {
"name": "meta.variable.gdscript",
"begin": "\\b(?:(var)|(const))\\s+(?:(\\b[A-Z_][A-Z_0-9]*\\b)|([A-Za-z_]\\w*))\\s*",
"name": "meta.variable.declaration.gdscript",
"begin": "\\b(?:(var)|(const))\\b",
"beginCaptures": {
"1": { "name": "keyword.language.gdscript storage.type.var.gdscript" },
"2": { "name": "keyword.language.gdscript storage.type.const.gdscript" },
"3": { "name": "constant.language.gdscript" },
"4": { "name": "variable.other.gdscript" }
"2": { "name": "keyword.language.gdscript storage.type.const.gdscript" }
},
"end": "$|;",
"patterns": [
@@ -603,7 +601,7 @@
},
"any_method": {
"match": "\\b([A-Za-z_]\\w*)\\b(?=\\s*(?:[(]))",
"name": "support.function.any-method.gdscript"
"name": "entity.name.function.other.gdscript"
},
"any_variable": {
"match": "\\b(?<![@\\$#%])([A-Za-z_]\\w*)\\b(?![(])",
@@ -620,8 +618,7 @@
"function_call": {
"name": "meta.function-call.gdscript",
"comment": "Regular function call of the type \"name(args)\"",
"begin": "(?x)\n \\b(?=\n ([a-zA-Z_]\\w*) \\s* (\\()\n )\n",
"beginCaptures": { "2": { "name": "punctuation.definition.arguments.begin.gdscript" } },
"begin": "(?=\\b[a-zA-Z_]\\w*\\b\\()",
"end": "(\\))",
"endCaptures": { "1": { "name": "punctuation.definition.arguments.end.gdscript" } },
"patterns": [
@@ -632,17 +629,21 @@
"function_name": {
"patterns": [
{ "include": "#builtin_classes" },
{
"match": "\\b(preload)\\b",
"name": "keyword.language.gdscript"
},
{
"comment": "Some color schemas support meta.function-call.generic scope",
"name": "support.function.any-method.gdscript",
"match": "(?x)\n \\b ([a-zA-Z_]\\w*) \\b\n"
"match": "\\b([a-zA-Z_]\\w*)\\b",
"name": "entity.name.function.gdscript"
}
]
},
"function_arguments": {
"begin": "(\\()",
"end": "(?=\\))(?!\\)\\s*\\()",
"beginCaptures": { "1": { "name": "punctuation.definition.arguments.begin.gdscript" } },
"end": "(?=\\))(?!\\)\\s*\\()",
"contentName": "meta.function.parameters.gdscript",
"patterns": [
{