Update gdscript queries (#4405)

* locals(gdscript): update locals

* folds(gdscript): add folds

* indents(gdscript): update indents with notes

* highlights(gdscript): update highlights

* docs(gdscript): add gdscript maintainer

* indents(gdscript): add ERROR auto indent

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>

* highlights(gdscript): use text.uri for get_node and node_path

* highlights(gdscript): add "@" of annotation as attribute

* highlights(gdscript): use keyword.operator for "new", match all attribute_call

* highlights(gdscript): update (underscore) and (pattern_open_ending)

---------

Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>

4 files changed, 411 insertions, 35 deletions

diff --git a/queries/gdscript/folds.scm b/queries/gdscript/folds.scm
new file mode 100644
index 000000000..946b0fea3
--- /dev/null
+++ b/queries/gdscript/folds.scm
@@ -0,0 +1,25 @@
+[
+  ; Body fold will "join" the next adjacent fold into a SUPER fold.
+  ; This is an issue with the grammar.
+  ; (body)
+
+  (if_statement)
+  (elif_clause)
+  (else_clause)
+  (for_statement)
+  (while_statement)
+  (class_definition)
+  (enum_definition)
+  (match_statement)
+  (pattern_section)
+  (function_definition)
+  (lambda)
+  (constructor_definition)
+] @fold
+
+; It's nice to be able to fold the if/elif/else clauses and the entire
+; if_statement.
+(if_statement (body) @fold)
+
+; Fold strings that are probably doc strings.
+(expression_statement (string) @fold)
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 7b5469f62..073096556 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -1,21 +1,30 @@
 ;; Basic
+(ERROR) @error
+
 (identifier) @variable
 (name) @variable
 (type) @type
-(comment) @comment
-(get_node) @string
+(comment) @comment @spell
+(string_name) @string
 (string) @string
 (float) @float
 (integer) @number
 (null) @constant
 (setter) @function
 (getter) @function
+(set_body "set" @keyword.function)
+(get_body "get" @keyword.function)
 (static_keyword) @type.qualifier
 (tool_statement) @keyword
-(breakpoint_statement) @keyword
+(breakpoint_statement) @debug
 (inferred_type) @operator
 [(true) (false)] @boolean
 
+[
+  (get_node)
+  (node_path)
+] @text.uri
+
 (class_name_statement
   (name) @type) @keyword
 
@@ -23,16 +32,13 @@
   "const" @type.qualifier
   (name) @constant)
 
-((identifier) @variable.builtin
-  (#eq? @variable.builtin "self"))
+(expression_statement (string) @comment @spell)
 
 ;; Identifier naming conventions
 ((identifier) @type
   (#lua-match? @type "^[A-Z]"))
 ((identifier) @constant
   (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
-((identifier) @type
-  (#lua-match? @type "^[A-Z][A-Z_0-9]*$") . (_))
 
 ;; Functions
 (constructor_definition) @constructor
@@ -41,16 +47,44 @@
   (name) @function (parameters
     (identifier) @parameter)*)
 
-(typed_parameter
-  (identifier) @parameter)
+(typed_parameter (identifier) @parameter)
+(default_parameter (identifier) @parameter)
+
+(call (identifier) @function.call)
+(call (identifier) @include
+      (#any-of? @include "preload" "load"))
+
+;; Properties and Methods
+
+; We'll use @property since that's the term Godot uses.
+; But, should (source (variable_statement (name))) be @property, too? Since a
+; script file is a class in gdscript.
+(class_definition
+  (body (variable_statement (name) @property)))
+
+; Same question but for methods?
+(class_definition
+  (body (function_definition (name) @method)))
 
-(default_parameter
-  (identifier) @parameter)
+(attribute_call (identifier) @method.call)
+(attribute (_) (identifier) @property)
 
-(call
-  (identifier) @function)
-(attribute_call
-  (identifier) @function)
+;; Enums
+
+(enumerator left: (identifier) @constant)
+
+;; Special Builtins
+
+((identifier) @variable.builtin
+  (#any-of? @variable.builtin "self" "super"))
+
+(attribute_call (identifier) @keyword.operator
+ (#eq? @keyword.operator "new"))
+
+;; Match Pattern
+
+(underscore) @constant          ; The "_" pattern.
+(pattern_open_ending) @operator ; The ".." pattern.
 
 ;; Alternations
 ["(" ")" "[" "]" "{" "}"] @punctuation.bracket
@@ -109,7 +143,6 @@
   "class_name"
   "extends"
   "signal"
-  "func"
   "enum"
   "var"
   "onready"
@@ -123,4 +156,186 @@
   "puppetsync"
 ] @keyword
 
-"return" @keyword.return
+"func" @keyword.function
+
+[
+  "await"
+  "return"
+] @keyword.return
+
+(call (identifier) @keyword.return
+      (#eq? @keyword.return "yield"))
+
+
+;; Builtins
+; generated from
+; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/doc/classes/@GlobalScope.xml
+; - https://github.com/godotengine/godot/blob/491ded18983a4ae963ce9c29e8df5d5680873ccb/modules/gdscript/doc_classes/@GDScript.xml
+; some from:
+; - https://github.com/godotengine/godot-vscode-plugin/blob/0636797c22bf1e23a41fd24d55cdb9be62e0c992/syntaxes/GDScript.tmLanguage.json
+
+;; Bulitin Annotations
+
+((annotation "@" @attribute (identifier) @attribute)
+ (#any-of? @attribute
+  ; @GDScript
+  "export" "export_category" "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_group" "export_multiline" "export_node_path"
+  "export_placeholder" "export_range" "export_subgroup" "icon" "onready"
+  "rpc" "tool" "warning_ignore"
+ ))
+
+;; Builtin Types
+
+([(identifier) (type)] @type.builtin
+  (#any-of? @type.builtin
+   ; from godot-vscode-plugin
+   "Vector2" "Vector2i" "Vector3" "Vector3i"
+   "Color" "Rect2" "Rect2i" "Array" "Basis" "Dictionary"
+   "Plane" "Quat" "RID" "Rect3" "Transform" "Transform2D"
+   "Transform3D" "AABB" "String" "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"
+
+   ; @GlobalScope
+   "AudioServer" "CameraServer" "ClassDB" "DisplayServer" "Engine"
+   "EngineDebugger" "GDExtensionManager" "Geometry2D" "Geometry3D" "GodotSharp"
+   "IP" "Input" "InputMap" "JavaClassWrapper" "JavaScriptBridge" "Marshalls"
+   "NavigationMeshGenerator" "NavigationServer2D" "NavigationServer3D" "OS"
+   "Performance" "PhysicsServer2D" "PhysicsServer2DManager" "PhysicsServer3D"
+   "PhysicsServer3DManager" "ProjectSettings" "RenderingServer" "ResourceLoader"
+   "ResourceSaver" "ResourceUID" "TextServerManager" "ThemeDB" "Time"
+   "TranslationServer" "WorkerThreadPool" "XRServer"
+  ))
+
+;; Builtin Funcs
+
+(call (identifier) @function.builtin
+      (#any-of? @function.builtin
+       ; @GlobalScope
+       "abs" "absf" "absi" "acos" "asin" "atan" "atan2" "bezier_derivative"
+       "bezier_interpolate" "bytes_to_var" "bytes_to_var_with_objects" "ceil" "ceilf"
+       "ceili" "clamp" "clampf" "clampi" "cos" "cosh" "cubic_interpolate"
+       "cubic_interpolate_angle" "cubic_interpolate_angle_in_time"
+       "cubic_interpolate_in_time" "db_to_linear" "deg_to_rad" "ease" "error_string"
+       "exp" "floor" "floorf" "floori" "fmod" "fposmod" "hash" "instance_from_id"
+       "inverse_lerp" "is_equal_approx" "is_finite" "is_inf" "is_instance_id_valid"
+       "is_instance_valid" "is_nan" "is_same" "is_zero_approx" "lerp" "lerp_angle"
+       "lerpf" "linear_to_db" "log" "max" "maxf" "maxi" "min" "minf" "mini"
+       "move_toward" "nearest_po2" "pingpong" "posmod" "pow" "print" "print_rich"
+       "print_verbose" "printerr" "printraw" "prints" "printt" "push_error"
+       "push_warning" "rad_to_deg" "rand_from_seed" "randf" "randf_range" "randfn"
+       "randi" "randi_range" "randomize" "remap" "rid_allocate_id" "rid_from_int64"
+       "round" "roundf" "roundi" "seed" "sign" "signf" "signi" "sin" "sinh"
+       "smoothstep" "snapped" "snappedf" "snappedi" "sqrt" "step_decimals" "str"
+       "str_to_var" "tan" "tanh" "typeof" "var_to_bytes" "var_to_bytes_with_objects"
+       "var_to_str" "weakref" "wrap" "wrapf" "wrapi"
+
+       ; @GDScript
+       "Color8" "assert" "char" "convert" "dict_to_inst" "get_stack" "inst_to_dict"
+       "is_instance_of" "len" "print_debug" "print_stack" "range"
+       "type_exists"
+      ))
+
+;; Builtin Constants
+
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin
+  ; @GDScript
+  "PI" "TAU" "INF" "NAN"
+
+  ; @GlobalScope
+  "SIDE_LEFT" "SIDE_TOP" "SIDE_RIGHT" "SIDE_BOTTOM" "CORNER_TOP_LEFT" "CORNER_TOP_RIGHT" "CORNER_BOTTOM_RIGHT"
+  "CORNER_BOTTOM_LEFT" "VERTICAL" "HORIZONTAL" "CLOCKWISE" "COUNTERCLOCKWISE" "HORIZONTAL_ALIGNMENT_LEFT"
+  "HORIZONTAL_ALIGNMENT_CENTER" "HORIZONTAL_ALIGNMENT_RIGHT" "HORIZONTAL_ALIGNMENT_FILL" "VERTICAL_ALIGNMENT_TOP"
+  "VERTICAL_ALIGNMENT_CENTER" "VERTICAL_ALIGNMENT_BOTTOM" "VERTICAL_ALIGNMENT_FILL" "INLINE_ALIGNMENT_TOP_TO"
+  "INLINE_ALIGNMENT_CENTER_TO" "INLINE_ALIGNMENT_BASELINE_TO" "INLINE_ALIGNMENT_BOTTOM_TO" "INLINE_ALIGNMENT_TO_TOP"
+  "INLINE_ALIGNMENT_TO_CENTER" "INLINE_ALIGNMENT_TO_BASELINE" "INLINE_ALIGNMENT_TO_BOTTOM" "INLINE_ALIGNMENT_TOP"
+  "INLINE_ALIGNMENT_CENTER" "INLINE_ALIGNMENT_BOTTOM" "INLINE_ALIGNMENT_IMAGE_MASK" "INLINE_ALIGNMENT_TEXT_MASK"
+  "EULER_ORDER_XYZ" "EULER_ORDER_XZY" "EULER_ORDER_YXZ" "EULER_ORDER_YZX" "EULER_ORDER_ZXY" "EULER_ORDER_ZYX" "KEY_NONE"
+  "KEY_SPECIAL" "KEY_ESCAPE" "KEY_TAB" "KEY_BACKTAB" "KEY_BACKSPACE" "KEY_ENTER" "KEY_KP_ENTER" "KEY_INSERT" "KEY_DELETE"
+  "KEY_PAUSE" "KEY_PRINT" "KEY_SYSREQ" "KEY_CLEAR" "KEY_HOME" "KEY_END" "KEY_LEFT" "KEY_UP" "KEY_RIGHT" "KEY_DOWN"
+  "KEY_PAGEUP" "KEY_PAGEDOWN" "KEY_SHIFT" "KEY_CTRL" "KEY_META" "KEY_ALT" "KEY_CAPSLOCK" "KEY_NUMLOCK" "KEY_SCROLLLOCK"
+  "KEY_F1" "KEY_F2" "KEY_F3" "KEY_F4" "KEY_F5" "KEY_F6" "KEY_F7" "KEY_F8" "KEY_F9" "KEY_F10" "KEY_F11" "KEY_F12"
+  "KEY_F13" "KEY_F14" "KEY_F15" "KEY_F16" "KEY_F17" "KEY_F18" "KEY_F19" "KEY_F20" "KEY_F21" "KEY_F22" "KEY_F23" "KEY_F24"
+  "KEY_F25" "KEY_F26" "KEY_F27" "KEY_F28" "KEY_F29" "KEY_F30" "KEY_F31" "KEY_F32" "KEY_F33" "KEY_F34" "KEY_F35"
+  "KEY_KP_MULTIPLY" "KEY_KP_DIVIDE" "KEY_KP_SUBTRACT" "KEY_KP_PERIOD" "KEY_KP_ADD" "KEY_KP_0" "KEY_KP_1" "KEY_KP_2"
+  "KEY_KP_3" "KEY_KP_4" "KEY_KP_5" "KEY_KP_6" "KEY_KP_7" "KEY_KP_8" "KEY_KP_9" "KEY_MENU" "KEY_HYPER" "KEY_HELP"
+  "KEY_BACK" "KEY_FORWARD" "KEY_STOP" "KEY_REFRESH" "KEY_VOLUMEDOWN" "KEY_VOLUMEMUTE" "KEY_VOLUMEUP" "KEY_MEDIAPLAY"
+  "KEY_MEDIASTOP" "KEY_MEDIAPREVIOUS" "KEY_MEDIANEXT" "KEY_MEDIARECORD" "KEY_HOMEPAGE" "KEY_FAVORITES" "KEY_SEARCH"
+  "KEY_STANDBY" "KEY_OPENURL" "KEY_LAUNCHMAIL" "KEY_LAUNCHMEDIA" "KEY_LAUNCH0" "KEY_LAUNCH1" "KEY_LAUNCH2" "KEY_LAUNCH3"
+  "KEY_LAUNCH4" "KEY_LAUNCH5" "KEY_LAUNCH6" "KEY_LAUNCH7" "KEY_LAUNCH8" "KEY_LAUNCH9" "KEY_LAUNCHA" "KEY_LAUNCHB"
+  "KEY_LAUNCHC" "KEY_LAUNCHD" "KEY_LAUNCHE" "KEY_LAUNCHF" "KEY_UNKNOWN" "KEY_SPACE" "KEY_EXCLAM" "KEY_QUOTEDBL"
+  "KEY_NUMBERSIGN" "KEY_DOLLAR" "KEY_PERCENT" "KEY_AMPERSAND" "KEY_APOSTROPHE" "KEY_PARENLEFT" "KEY_PARENRIGHT"
+  "KEY_ASTERISK" "KEY_PLUS" "KEY_COMMA" "KEY_MINUS" "KEY_PERIOD" "KEY_SLASH" "KEY_0" "KEY_1" "KEY_2" "KEY_3" "KEY_4"
+  "KEY_5" "KEY_6" "KEY_7" "KEY_8" "KEY_9" "KEY_COLON" "KEY_SEMICOLON" "KEY_LESS" "KEY_EQUAL" "KEY_GREATER" "KEY_QUESTION"
+  "KEY_AT" "KEY_A" "KEY_B" "KEY_C" "KEY_D" "KEY_E" "KEY_F" "KEY_G" "KEY_H" "KEY_I" "KEY_J" "KEY_K" "KEY_L" "KEY_M"
+  "KEY_N" "KEY_O" "KEY_P" "KEY_Q" "KEY_R" "KEY_S" "KEY_T" "KEY_U" "KEY_V" "KEY_W" "KEY_X" "KEY_Y" "KEY_Z"
+  "KEY_BRACKETLEFT" "KEY_BACKSLASH" "KEY_BRACKETRIGHT" "KEY_ASCIICIRCUM" "KEY_UNDERSCORE" "KEY_QUOTELEFT" "KEY_BRACELEFT"
+  "KEY_BAR" "KEY_BRACERIGHT" "KEY_ASCIITILDE" "KEY_YEN" "KEY_SECTION" "KEY_GLOBE" "KEY_KEYBOARD" "KEY_JIS_EISU"
+  "KEY_JIS_KANA" "KEY_CODE_MASK" "KEY_MODIFIER_MASK" "KEY_MASK_CMD_OR_CTRL" "KEY_MASK_SHIFT" "KEY_MASK_ALT"
+  "KEY_MASK_META" "KEY_MASK_CTRL" "KEY_MASK_KPAD" "KEY_MASK_GROUP_SWITCH" "MOUSE_BUTTON_NONE" "MOUSE_BUTTON_LEFT"
+  "MOUSE_BUTTON_RIGHT" "MOUSE_BUTTON_MIDDLE" "MOUSE_BUTTON_WHEEL_UP" "MOUSE_BUTTON_WHEEL_DOWN" "MOUSE_BUTTON_WHEEL_LEFT"
+  "MOUSE_BUTTON_WHEEL_RIGHT" "MOUSE_BUTTON_XBUTTON1" "MOUSE_BUTTON_XBUTTON2" "MOUSE_BUTTON_MASK_LEFT"
+  "MOUSE_BUTTON_MASK_RIGHT" "MOUSE_BUTTON_MASK_MIDDLE" "MOUSE_BUTTON_MASK_MB_XBUTTON1" "MOUSE_BUTTON_MASK_MB_XBUTTON2"
+  "JOY_BUTTON_INVALID" "JOY_BUTTON_A" "JOY_BUTTON_B" "JOY_BUTTON_X" "JOY_BUTTON_Y" "JOY_BUTTON_BACK" "JOY_BUTTON_GUIDE"
+  "JOY_BUTTON_START" "JOY_BUTTON_LEFT_STICK" "JOY_BUTTON_RIGHT_STICK" "JOY_BUTTON_LEFT_SHOULDER"
+  "JOY_BUTTON_RIGHT_SHOULDER" "JOY_BUTTON_DPAD_UP" "JOY_BUTTON_DPAD_DOWN" "JOY_BUTTON_DPAD_LEFT" "JOY_BUTTON_DPAD_RIGHT"
+  "JOY_BUTTON_MISC1" "JOY_BUTTON_PADDLE1" "JOY_BUTTON_PADDLE2" "JOY_BUTTON_PADDLE3" "JOY_BUTTON_PADDLE4"
+  "JOY_BUTTON_TOUCHPAD" "JOY_BUTTON_SDL_MAX" "JOY_BUTTON_MAX" "JOY_AXIS_INVALID" "JOY_AXIS_LEFT_X" "JOY_AXIS_LEFT_Y"
+  "JOY_AXIS_RIGHT_X" "JOY_AXIS_RIGHT_Y" "JOY_AXIS_TRIGGER_LEFT" "JOY_AXIS_TRIGGER_RIGHT" "JOY_AXIS_SDL_MAX"
+  "JOY_AXIS_MAX" "MIDI_MESSAGE_NONE" "MIDI_MESSAGE_NOTE_OFF" "MIDI_MESSAGE_NOTE_ON" "MIDI_MESSAGE_AFTERTOUCH"
+  "MIDI_MESSAGE_CONTROL_CHANGE" "MIDI_MESSAGE_PROGRAM_CHANGE" "MIDI_MESSAGE_CHANNEL_PRESSURE" "MIDI_MESSAGE_PITCH_BEND"
+  "MIDI_MESSAGE_SYSTEM_EXCLUSIVE" "MIDI_MESSAGE_QUARTER_FRAME" "MIDI_MESSAGE_SONG_POSITION_POINTER"
+  "MIDI_MESSAGE_SONG_SELECT" "MIDI_MESSAGE_TUNE_REQUEST" "MIDI_MESSAGE_TIMING_CLOCK" "MIDI_MESSAGE_START"
+  "MIDI_MESSAGE_CONTINUE" "MIDI_MESSAGE_STOP" "MIDI_MESSAGE_ACTIVE_SENSING" "MIDI_MESSAGE_SYSTEM_RESET" "OK" "FAILED"
+  "ERR_UNAVAILABLE" "ERR_UNCONFIGURED" "ERR_UNAUTHORIZED" "ERR_PARAMETER_RANGE_ERROR" "ERR_OUT_OF_MEMORY"
+  "ERR_FILE_NOT_FOUND" "ERR_FILE_BAD_DRIVE" "ERR_FILE_BAD_PATH" "ERR_FILE_NO_PERMISSION" "ERR_FILE_ALREADY_IN_USE"
+  "ERR_FILE_CANT_OPEN" "ERR_FILE_CANT_WRITE" "ERR_FILE_CANT_READ" "ERR_FILE_UNRECOGNIZED" "ERR_FILE_CORRUPT"
+  "ERR_FILE_MISSING_DEPENDENCIES" "ERR_FILE_EOF" "ERR_CANT_OPEN" "ERR_CANT_CREATE" "ERR_QUERY_FAILED"
+  "ERR_ALREADY_IN_USE" "ERR_LOCKED" "ERR_TIMEOUT" "ERR_CANT_CONNECT" "ERR_CANT_RESOLVE" "ERR_CONNECTION_ERROR"
+  "ERR_CANT_ACQUIRE_RESOURCE" "ERR_CANT_FORK" "ERR_INVALID_DATA" "ERR_INVALID_PARAMETER" "ERR_ALREADY_EXISTS"
+  "ERR_DOES_NOT_EXIST" "ERR_DATABASE_CANT_READ" "ERR_DATABASE_CANT_WRITE" "ERR_COMPILATION_FAILED" "ERR_METHOD_NOT_FOUND"
+  "ERR_LINK_FAILED" "ERR_SCRIPT_FAILED" "ERR_CYCLIC_LINK" "ERR_INVALID_DECLARATION" "ERR_DUPLICATE_SYMBOL"
+  "ERR_PARSE_ERROR" "ERR_BUSY" "ERR_SKIP" "ERR_HELP" "ERR_BUG" "ERR_PRINTER_ON_FIRE" "PROPERTY_HINT_NONE"
+  "PROPERTY_HINT_RANGE" "PROPERTY_HINT_ENUM" "PROPERTY_HINT_ENUM_SUGGESTION" "PROPERTY_HINT_EXP_EASING"
+  "PROPERTY_HINT_LINK" "PROPERTY_HINT_FLAGS" "PROPERTY_HINT_LAYERS_2D_RENDER" "PROPERTY_HINT_LAYERS_2D_PHYSICS"
+  "PROPERTY_HINT_LAYERS_2D_NAVIGATION" "PROPERTY_HINT_LAYERS_3D_RENDER" "PROPERTY_HINT_LAYERS_3D_PHYSICS"
+  "PROPERTY_HINT_LAYERS_3D_NAVIGATION" "PROPERTY_HINT_FILE" "PROPERTY_HINT_DIR" "PROPERTY_HINT_GLOBAL_FILE"
+  "PROPERTY_HINT_GLOBAL_DIR" "PROPERTY_HINT_RESOURCE_TYPE" "PROPERTY_HINT_MULTILINE_TEXT" "PROPERTY_HINT_EXPRESSION"
+  "PROPERTY_HINT_PLACEHOLDER_TEXT" "PROPERTY_HINT_COLOR_NO_ALPHA" "PROPERTY_HINT_OBJECT_ID" "PROPERTY_HINT_TYPE_STRING"
+  "PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE" "PROPERTY_HINT_OBJECT_TOO_BIG" "PROPERTY_HINT_NODE_PATH_VALID_TYPES"
+  "PROPERTY_HINT_SAVE_FILE" "PROPERTY_HINT_GLOBAL_SAVE_FILE" "PROPERTY_HINT_INT_IS_OBJECTID"
+  "PROPERTY_HINT_INT_IS_POINTER" "PROPERTY_HINT_ARRAY_TYPE" "PROPERTY_HINT_LOCALE_ID" "PROPERTY_HINT_LOCALIZABLE_STRING"
+  "PROPERTY_HINT_NODE_TYPE" "PROPERTY_HINT_HIDE_QUATERNION_EDIT" "PROPERTY_HINT_PASSWORD" "PROPERTY_HINT_MAX"
+  "PROPERTY_USAGE_NONE" "PROPERTY_USAGE_STORAGE" "PROPERTY_USAGE_EDITOR" "PROPERTY_USAGE_INTERNAL"
+  "PROPERTY_USAGE_CHECKABLE" "PROPERTY_USAGE_CHECKED" "PROPERTY_USAGE_GROUP" "PROPERTY_USAGE_CATEGORY"
+  "PROPERTY_USAGE_SUBGROUP" "PROPERTY_USAGE_CLASS_IS_BITFIELD" "PROPERTY_USAGE_NO_INSTANCE_STATE"
+  "PROPERTY_USAGE_RESTART_IF_CHANGED" "PROPERTY_USAGE_SCRIPT_VARIABLE" "PROPERTY_USAGE_STORE_IF_NULL"
+  "PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED" "PROPERTY_USAGE_SCRIPT_DEFAULT_VALUE" "PROPERTY_USAGE_CLASS_IS_ENUM"
+  "PROPERTY_USAGE_NIL_IS_VARIANT" "PROPERTY_USAGE_ARRAY" "PROPERTY_USAGE_ALWAYS_DUPLICATE"
+  "PROPERTY_USAGE_NEVER_DUPLICATE" "PROPERTY_USAGE_HIGH_END_GFX" "PROPERTY_USAGE_NODE_PATH_FROM_SCENE_ROOT"
+  "PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT" "PROPERTY_USAGE_KEYING_INCREMENTS" "PROPERTY_USAGE_DEFERRED_SET_RESOURCE"
+  "PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT" "PROPERTY_USAGE_EDITOR_BASIC_SETTING" "PROPERTY_USAGE_READ_ONLY"
+  "PROPERTY_USAGE_DEFAULT" "PROPERTY_USAGE_NO_EDITOR" "METHOD_FLAG_NORMAL" "METHOD_FLAG_EDITOR" "METHOD_FLAG_CONST"
+  "METHOD_FLAG_VIRTUAL" "METHOD_FLAG_VARARG" "METHOD_FLAG_STATIC" "METHOD_FLAG_OBJECT_CORE" "METHOD_FLAGS_DEFAULT"
+  "TYPE_NIL" "TYPE_BOOL" "TYPE_INT" "TYPE_FLOAT" "TYPE_STRING" "TYPE_VECTOR2" "TYPE_VECTOR2I" "TYPE_RECT2" "TYPE_RECT2I"
+  "TYPE_VECTOR3" "TYPE_VECTOR3I" "TYPE_TRANSFORM2D" "TYPE_VECTOR4" "TYPE_VECTOR4I" "TYPE_PLANE" "TYPE_QUATERNION"
+  "TYPE_AABB" "TYPE_BASIS" "TYPE_TRANSFORM3D" "TYPE_PROJECTION" "TYPE_COLOR" "TYPE_STRING_NAME" "TYPE_NODE_PATH"
+  "TYPE_RID" "TYPE_OBJECT" "TYPE_CALLABLE" "TYPE_SIGNAL" "TYPE_DICTIONARY" "TYPE_ARRAY" "TYPE_PACKED_BYTE_ARRAY"
+  "TYPE_PACKED_INT32_ARRAY" "TYPE_PACKED_INT64_ARRAY" "TYPE_PACKED_FLOAT32_ARRAY" "TYPE_PACKED_FLOAT64_ARRAY"
+  "TYPE_PACKED_STRING_ARRAY" "TYPE_PACKED_VECTOR2_ARRAY" "TYPE_PACKED_VECTOR3_ARRAY" "TYPE_PACKED_COLOR_ARRAY" "TYPE_MAX"
+  "OP_EQUAL" "OP_NOT_EQUAL" "OP_LESS" "OP_LESS_EQUAL" "OP_GREATER" "OP_GREATER_EQUAL" "OP_ADD" "OP_SUBTRACT"
+  "OP_MULTIPLY" "OP_DIVIDE" "OP_NEGATE" "OP_POSITIVE" "OP_MODULE" "OP_POWER" "OP_SHIFT_LEFT" "OP_SHIFT_RIGHT"
+  "OP_BIT_AND" "OP_BIT_OR" "OP_BIT_XOR" "OP_BIT_NEGATE" "OP_AND" "OP_OR" "OP_XOR" "OP_NOT" "OP_IN" "OP_MAX"
+ ))
+
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
index 38069c38f..74d14d3b8 100644
--- a/queries/gdscript/indents.scm
+++ b/queries/gdscript/indents.scm
@@ -1,24 +1,78 @@
 [
-  (if_statement)
+  (lambda)
+  (function_definition)
 
   (for_statement)
   (while_statement)
-
-  (parenthesized_expression)
-
-  (function_definition)
+  (if_statement)
   (class_definition)
+  (match_statement)
+  (pattern_section)
+  (setget)
+  (match_body)
+  (set_body)
+  (get_body)
 ] @indent
 
-((arguments) @aligned_indent
- (#set! "delimiter" "()"))
-((parameters) @aligned_indent
- (#set! "delimiter" "()"))
-
 [
-  ")"
-  "]"
-  "}"
   (elif_clause)
   (else_clause)
 ] @branch
+
+[
+ (string)
+ (comment)
+ (array)
+ (dictionary)
+ (parenthesized_expression)
+ (ERROR)
+] @auto
+
+[
+  (pass_statement)
+  (continue_statement)
+  (break_statement)
+  (return_statement)
+] @dedent
+
+[
+  (ERROR "[")
+  (ERROR "(")
+  (ERROR "{")
+] @indent
+
+;; This only works with expanded tabs.
+; ((parameters) @aligned_indent (#set! "delimiter" "()"))
+; ((arguments)  @aligned_indent (#set! "delimiter" "()"))
+
+;; The following queries either do not agree with the current body parsing or are
+;; attempted workarounds. Specifically as the last statement of a body. Opening
+;; a new line in between statements works well.
+;;
+;; The overall experience is poor, so I've opted for @auto.
+;;
+;; The gdscript parser will need to be patched to accommodate more interactive
+;; edits. As far as I can tell the parser greedily consumes whitespace
+;; as a zero-width token which causes trouble when inserting indents.
+
+;; This indents correctly with tabs.
+; (arguments) @indent
+; (parameters) @indent
+; (array) @indent
+; (dictionary) @indent
+; (parenthesized_expression) @indent
+
+;; Partial workaround for when the cursor is on the bracket character and a newline
+;; is created with <o>. Without this the newline is opened with extra
+;; indentation.
+; (body (_ (array "]" @indent_end) ) _)
+;; Problematic behaviors occur at the last statement of a body.
+;; with @dedent:
+;;   - [ | ] i<CR> will dedent ] to 0.
+;;   - [
+;;   ]| o will open new line at correct indentation.
+;; with @auto:
+;;   - [ | ] i<CR> same
+;;   - [
+;;   ]| o will open new line with extra indent.
+;(body (_ (array "]" @auto) ) .)
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
index 313af2aef..2c352b4a3 100644
--- a/queries/gdscript/locals.scm
+++ b/queries/gdscript/locals.scm
@@ -1,10 +1,92 @@
-(function_definition) @definition.function
+;; Scopes
 
 [
-  (extends_statement)
-  (variable_statement)
-  (expression_statement)
   (if_statement)
+  (elif_clause)
+  (else_clause)
+  (for_statement)
+  (while_statement)
   (function_definition)
-  (body)
+  (constructor_definition)
+  (class_definition)
+  (match_statement)
+  (pattern_section)
+  (lambda)
+  (get_body)
+  (set_body)
 ] @scope
+
+;; Parameters
+
+(parameters (identifier) @definition.parameter)
+(default_parameter (identifier) @definition.parameter)
+(typed_parameter (identifier) @definition.parameter)
+(typed_default_parameter (identifier) @definition.parameter)
+
+;; Signals
+
+; Can gdscript 2 signals be considered fields?
+(signal_statement (name) @definition.field)
+
+;; Variable Definitions
+
+(const_statement (name) @definition.constant)
+; onready and export variations are only properties.
+(variable_statement (name) @definition.var)
+
+(setter) @reference
+(getter) @reference
+
+;; Function Definition
+
+((function_definition (name) @definition.function)
+ (#set! "definition.function.scope" "parent"))
+
+;; Lambda
+
+; lambda names are not accessible and are only for debugging.
+(lambda (name) @definition.function)
+
+;; Source
+
+(class_name_statement (name) @definition.type)
+
+(source (variable_statement (name) @definition.field))
+(source (onready_variable_statement (name) @definition.field))
+(source (export_variable_statement (name) @definition.field))
+
+;; Class
+
+((class_definition (name) @definition.type)
+ (#set! "definition.type.scope" "parent"))
+
+(class_definition
+  (body (variable_statement (name) @definition.field)))
+(class_definition
+  (body (onready_variable_statement (name) @definition.field)))
+(class_definition
+  (body (export_variable_statement (name) @definition.field)))
+(class_definition
+  (body (signal_statement (name) @definition.field)))
+
+; Although a script is also a class, let's only define functions in an inner class as
+; methods.
+((class_definition
+  (body (function_definition (name) @definition.method)))
+ (#set! "definition.method.scope" "parent"))
+
+;; Enum
+
+((enum_definition (name) @definition.enum))
+
+;; Repeat
+
+(for_statement . (identifier) @definition.var)
+
+;; Match Statement
+
+(pattern_binding (identifier) @definition.var)
+
+;; References
+
+(identifier) @reference