fix: limit locals queries to function parameters only

Author: digitcrusher

grammar.js

@@ -408,10 +408,6 @@ module.exports = grammar({
       optional('async'),
       'def',
       field('name', $.identifier),
-      $.function_definition_scope,
-    ),
-
-    function_definition_scope: $ => seq(
       field('type_parameters', optional($.type_parameter)),
       '(',
       field('parameters', optional($.parameters)),
@@ -499,9 +495,6 @@ module.exports = grammar({
     class_definition: $ => seq(
       'class',
       field('name', $.identifier),
-      $.class_definition_scope,
-    ),
-    class_definition_scope: $ => seq(
       field('type_parameters', optional($.type_parameter)),
       field('superclasses', optional($.argument_list)),
       ':',

queries/highlights.scm

@@ -92,26 +92,26 @@
 
 (assignment left: [(identifier) @variable
                    (_ attribute: _ @member_variable)])
-(class_definition (_ (_ (assignment left: (identifier) @member_variable))))
+(class_definition (_ (assignment left: (identifier) @member_variable)))
 
 (assignment left: (identifier) @type
  (#match? @type "^[A-Z]"))
 ([(assignment left: (_ attribute: _ @member_type))
-  (class_definition (_ (_ (assignment left: (identifier) @member_type))))]
+  (class_definition (_ (assignment left: (identifier) @member_type)))]
  (#match? @member_type "^[A-Z]"))
 
 (assignment
  left: (identifier) @constant
  (#match? @constant "^[A-Z_0-9]*$"))
 ([(assignment left: (_ attribute: _ @member_constant))
-  (class_definition (_ (_ (assignment left: (identifier) @member_constant))))]
+  (class_definition (_ (assignment left: (identifier) @member_constant)))]
  (#match? @member_constant "^[A-Z_0-9]*$"))
 
 (function_definition name: _ @function)
 (class_definition
- (_ (_
-     [(function_definition name: _ @member_function)
-      (decorated_definition (function_definition name: _ @member_function))])))
+ (_
+  [(function_definition name: _ @member_function)
+   (decorated_definition (function_definition name: _ @member_function))]))
 (assignment
  left: [(identifier) @function
         (_ attribute: _ @member_function)]
@@ -122,9 +122,9 @@
 
 (class_definition name: _ @type)
 (class_definition
- (_ (_
-     [(class_definition name: _ @member_type)
-      (decorated_definition (class_definition name: _ @member_type))])))
+ (_
+  [(class_definition name: _ @member_type)
+   (decorated_definition (class_definition name: _ @member_type))]))
 
 (parameter name: _ @function_parameter)
 (keyword_argument name: _ @function_parameter)
@@ -140,21 +140,21 @@
   "__loader__" "__name__" "__package__" "__path__" "__spec__"))
 
 ([(member_identifier) @special_member_variable
-  (class_definition (_ (_ (assignment left: (identifier) @special_member_variable))))]
+  (class_definition (_ (assignment left: (identifier) @special_member_variable)))]
  (#any-of? @special_member_variable "__dict__" "__doc__" "__match_args__"
   "__metaclass__" "__objclass__" "__slots__" "__weakref__"))
 
 ([(member_identifier) @special_member_constant
-  (class_definition (_ (_ (assignment left: (identifier) @special_member_constant))))]
+  (class_definition (_ (assignment left: (identifier) @special_member_constant)))]
  (#any-of? @special_member_constant "__annotations__" "__bases__" "__cached__"
   "__class__" "__classcell__" "__closure__" "__code__" "__defaults__" "__file__"
   "__firstlineno__" "__func__" "__globals__" "__kwdefaults__" "__loader__"
   "__module__" "__mro__" "__name__" "__package__" "__path__" "__qualname__"
   "__self__" "__spec__" "__static_attributes__" "__type_params__"))
 
 ([(member_identifier) @_name @special_member_function
-  (class_definition (_ (_ [(assignment left: (identifier) @_name @special_member_function)
-                           (function_definition name: _ @_name @special_member_function)])))
+  (class_definition (_ [(assignment left: (identifier) @_name @special_member_function)
+                        (function_definition name: _ @_name @special_member_function)]))
   (module (function_definition name: _ @_name @special_function))]
  (#any-of? @_name "__abs__" "__add__" "__aenter__" "__aexit__" "__aiter__"
   "__and__" "__anext__" "__await__" "__bool__" "__buffer__" "__bytes__"

queries/locals.scm

@@ -1,24 +1,10 @@
 ;; Scopes
 
-[(module)
- (class_definition_scope)
- (function_definition_scope)
- (lambda)] @local.scope
+[(function_definition) (lambda)] @local.scope
 
 ;; Definitions
 
-; TODO: Type parameters, patterns in assignment and match statements
-
-(import_statement (dotted_name . _ @local.definition))
-(import_from_statement name: (dotted_name . _ @local.definition))
-(aliased_import alias: _ @local.definition)
-(class_definition name: _ @local.definition)
-(type_alias_statement left: (type . (identifier) @local.definition))
-(function_definition name: _ @local.definition)
 (parameter name: _ @local.definition)
-(as_pattern alias: _ @local.definition)
-(named_expression name: (identifier) @local.definition)
-(assignment left: (identifier) @local.definition)
 
 ;; References