Skip to content

Commit

Permalink
Fix various highlighting errors (#407)
Browse files Browse the repository at this point in the history 
Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
  • Loading branch information
@DaelonSuzuka @Calinou
DaelonSuzuka and Calinou authored Aug 21, 2022
1 parent b3f4dda commit dfe2319
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 6 deletions.
99 changes: 93 additions & 6 deletions syntaxes/GDScript.tmLanguage.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
{
"include": "#logic_op"
},
{
"include": "#in_keyword"
},
{
"include": "#getter_setter_godot4"
},
{
"include": "#compare_op"
},
Expand All @@ -26,11 +32,14 @@
{
"include": "#assignment_op"
},
{
"include": "#lambda_declaration"
},
{
"include": "#control_flow"
},
{
"include": "#decorators"
"include": "#annotations"
},
{
"include": "#keywords"
Expand Down Expand Up @@ -238,6 +247,12 @@
{
"include": "#logic_op"
},
{
"include": "#lambda_declaration"
},
{
"include": "#in_keyword"
},
{
"include": "#control_flow"
},
Expand Down Expand Up @@ -277,6 +292,18 @@
"match": "\\b(and|or|not)\\b",
"name": "keyword.operator.wordlike.gdscript"
},
"in_keyword": {
"patterns": [
{
"match": "\\b(?<=for\\s[\\w]*\\s)(in)\\b",
"name": "keyword.control.gdscript"
},
{
"match": "\\bin\\b",
"name": "keyword.operator.wordlike.gdscript"
}
]
},
"compare_op": {
"match": "<=|>=|==|<|>|!=",
"name": "keyword.operator.comparison.gdscript"
Expand All @@ -290,11 +317,11 @@
"name": "keyword.operator.assignment.gdscript"
},
"control_flow": {
"match": "\\b(?i:if|elif|else|for|while|break|continue|pass|return|match|in|yield)\\b",
"match": "\\b(?i:if|elif|else|for|while|break|continue|pass|return|match|yield|await)\\b",
"name": "keyword.control.gdscript"
},
"keywords": {
"match": "\\b(?i:class|class_name|extends|is|onready|tool|static|export|setget|const|as|void|enum|preload|assert|breakpoint|rpc|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync)\\b",
"match": "\\b(?i:class|class_name|extends|is|onready|tool|static|export|setget|const|as|void|enum|preload|assert|breakpoint|rpc|sync|remote|master|puppet|slave|remotesync|mastersync|puppetsync|trait|namespace)\\b",
"name": "keyword.language.gdscript"
},
"letter": {
Expand Down Expand Up @@ -344,6 +371,45 @@
}
}
},
"getter_setter_godot4": {
"patterns": [
{
"match": "\\b(get):",
"captures": {
"1": {
"name": "entity.name.function.gdscript"
}
}
},
{
"name": "meta.function.gdscript",
"begin": "(?x) \\s+\n (set) \\s*\n (?=\\()",
"end": "(:|(?=[#'\"\\n]))",
"beginCaptures": {
"1": {
"name": "entity.name.function.gdscript"
}
},
"patterns": [
{
"include": "#parameters"
},
{
"include": "#line-continuation"
},
{
"match": "\\s*(\\-\\>)\\s*([a-zA-Z_][a-zA-Z_0-9]*)\\s*\\:",
"captures": {
"1": {},
"2": {
"name": "entity.name.type.class.gdscript"
}
}
}
]
}
]
},
"type_hint": {
"match": "\\:\\s*([a-zA-Z_][a-zA-Z_0-9]*)\\s*(?=[=\\n]|setget)",
"captures": {
Expand Down Expand Up @@ -473,19 +539,19 @@
}
]
},
"decorators": {
"annotations": {
"match": "(@)(export|export_color_no_alpha|export_dir|export_enum|export_exp_easing|export_file|export_flags|export_flags_2d_navigation|export_flags_2d_physics|export_flags_2d_render|export_flags_3d_navigation|export_flags_3d_physics|export_flags_3d_render|export_global_dir|export_global_file|export_multiline|export_node_path|export_placeholder|export_range|icon|onready|rpc|tool|warning_ignore)\\b",
"captures": {
"1": {
"name": "keyword.control.flow"
"name": "entity.name.function.decorator.gdscript"
},
"2": {
"name": "entity.name.function.decorator.gdscript"
}
}
},
"builtin_classes": {
"match": "(?<![^.]\\.|:)\\b(OS|Vector2|Vector2i|Vector3|Vector3i|Color|Rect2|Rect2i|Array|Basis|Dictionary|Plane|Quat|RID|Rect3|Transform|Transform2D|Transform3D|AABB|String|Color|NodePath|Object|PoolByteArray|PoolIntArray|PoolRealArray|PoolStringArray|PoolVector2Array|PoolVector3Array|PoolColorArray|bool|int|float|StringName|Quaternion|PackedByteArray|PackedInt32Array|PackedInt64Array|PackedFloat32Array|PackedFloat64Array|PackedStringArray|PackedVector2Array|PackedVector2iArray|PackedVector3Array|PackedVector3iArray|PackedColorArray)\\b",
"match": "(?<![^.]\\.|:)\\b(OS|Vector2|Vector2i|Vector3|Vector3i|Color|Rect2|Rect2i|Array|Basis|Dictionary|Plane|Quat|RID|Rect3|Transform|Transform2D|Transform3D|AABB|String|Color|NodePath|Object|PoolByteArray|PoolIntArray|PoolRealArray|PoolStringArray|PoolVector2Array|PoolVector3Array|PoolColorArray|bool|int|float|StringName|Quaternion|PackedByteArray|PackedInt32Array|PackedInt64Array|PackedFloat32Array|PackedFloat64Array|PackedStringArray|PackedVector2Array|PackedVector2iArray|PackedVector3Array|PackedVector3iArray|PackedColorArray|super)\\b",
"name": "support.class.library.gdscript"
},
"const_vars": {
Expand Down Expand Up @@ -537,6 +603,27 @@
}
]
},
"lambda_declaration": {
"name": "meta.function.gdscript",
"begin": "(func)(?=\\()",
"end": "(:|(?=[#'\"\\n]))",
"beginCaptures": {
"1": {
"name": "storage.type.function.gdscript"
},
"2": {
"name": "entity.name.function.gdscript"
}
},
"patterns": [
{
"include": "#parameters"
},
{
"include": "#line-continuation"
}
]
},
"function-declaration": {
"name": "meta.function.gdscript",
"begin": "(?x) \\s*\n (func) \\s+\n ([a-zA-Z_][a-zA-Z_0-9]*) \\s*\n (?=\\()",
Expand Down
7 changes: 7 additions & 0 deletions syntaxes/examples/gdscript1.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,15 @@ class InnerClass:
}

func _ready():
var list = []

for i in range(10):
list.append(i)

if true and true:
pass
elif 'foo' in list:
pass
elif false:
while true:
pass
Expand Down
55 changes: 55 additions & 0 deletions syntaxes/examples/gdscript2.gd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
extends Node
class_name TestClass2
@icon("res://path/to/icon.png")

# ******************************************************************************

@export var x : int
@export var y : int
@export var z : String
@export_node_path(Resource) var resource_name

var array_a: Array[int] = [1, 2, 3]
var array_b: Array[String] = ['1', '2', '3']

@rpc
func remote_function_a():
pass

@rpc(any_peer, call_local, unreliable)
func remote_function_b():
pass

# ------------------------------------------------------------------------------

func f():
await $Button.button_up
super()
super.some_function()

for i in range(1): # `in` is a control keyword
print(i in range(1)) # `in` is an operator keyword

func lambda_test():
var lambda_a = func(param1, param2, param3):
pass
var lambda_b = func(param1, param2=func_a(10, 1.0, 'test')):
pass
var lambda_c = func(param1 = false, param2: bool = false, param3 := false):
pass

lambda_a.call()
lambda_b.call()
lambda_c.call()

# ------------------------------------------------------------------------------

signal changed(new_value)
var warns_when_changed = "some value":
get:
return warns_when_changed
set(value):
changed.emit(value)
warns_when_changed = value

# ------------------------------------------------------------------------------

0 comments on commit dfe2319

Please sign in to comment.