mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-20 04:10:06 -04:00
feat(java): some instances of definition.var should be definition.parameter
This commit is contained in:
parent
7dfaa60a85
commit
f8595b13bf
1 changed files with 22 additions and 10 deletions
|
|
@ -1,5 +1,7 @@
|
||||||
; SCOPES
|
;; SCOPES
|
||||||
|
|
||||||
; declarations
|
; declarations
|
||||||
|
|
||||||
(program) @scope
|
(program) @scope
|
||||||
(class_declaration
|
(class_declaration
|
||||||
body: (_) @scope)
|
body: (_) @scope)
|
||||||
|
|
@ -11,9 +13,11 @@
|
||||||
(enhanced_for_statement) @scope
|
(enhanced_for_statement) @scope
|
||||||
|
|
||||||
; block
|
; block
|
||||||
|
|
||||||
(block) @scope
|
(block) @scope
|
||||||
|
|
||||||
; if/else
|
; if/else
|
||||||
|
|
||||||
(if_statement) @scope ; if+else
|
(if_statement) @scope ; if+else
|
||||||
(if_statement
|
(if_statement
|
||||||
consequence: (_) @scope) ; if body in case there are no braces
|
consequence: (_) @scope) ; if body in case there are no braces
|
||||||
|
|
@ -21,10 +25,12 @@
|
||||||
alternative: (_) @scope) ; else body in case there are no braces
|
alternative: (_) @scope) ; else body in case there are no braces
|
||||||
|
|
||||||
; try/catch
|
; try/catch
|
||||||
|
|
||||||
(try_statement) @scope ; covers try+catch, individual try and catch are covered by (block)
|
(try_statement) @scope ; covers try+catch, individual try and catch are covered by (block)
|
||||||
(catch_clause) @scope ; needed because `Exception` variable
|
(catch_clause) @scope ; needed because `Exception` variable
|
||||||
|
|
||||||
; loops
|
; loops
|
||||||
|
|
||||||
(for_statement) @scope ; whole for_statement because loop iterator variable
|
(for_statement) @scope ; whole for_statement because loop iterator variable
|
||||||
(for_statement ; "for" body in case there are no braces
|
(for_statement ; "for" body in case there are no braces
|
||||||
body: (_) @scope)
|
body: (_) @scope)
|
||||||
|
|
@ -38,32 +44,36 @@
|
||||||
(constructor_declaration) @scope
|
(constructor_declaration) @scope
|
||||||
(method_declaration) @scope
|
(method_declaration) @scope
|
||||||
|
|
||||||
|
;; DEFINITIONS
|
||||||
|
|
||||||
; DEFINITIONS
|
|
||||||
(package_declaration
|
(package_declaration
|
||||||
(identifier) @definition.namespace)
|
(identifier) @definition.namespace)
|
||||||
|
|
||||||
(class_declaration
|
(class_declaration
|
||||||
name: (identifier) @definition.type)
|
name: (identifier) @definition.type)
|
||||||
(record_declaration
|
(record_declaration
|
||||||
name: (identifier) @definition.type)
|
name: (identifier) @definition.type)
|
||||||
|
|
||||||
(enum_declaration
|
(enum_declaration
|
||||||
name: (identifier) @definition.enum)
|
name: (identifier) @definition.enum)
|
||||||
|
|
||||||
(method_declaration
|
(method_declaration
|
||||||
name: (identifier) @definition.method)
|
name: (identifier) @definition.method)
|
||||||
|
|
||||||
(local_variable_declaration
|
(local_variable_declaration
|
||||||
declarator: (variable_declarator
|
declarator: (variable_declarator
|
||||||
name: (identifier) @definition.var))
|
name: (identifier) @definition.var))
|
||||||
(formal_parameter
|
|
||||||
name: (identifier) @definition.var)
|
|
||||||
(catch_formal_parameter
|
|
||||||
name: (identifier) @definition.var)
|
|
||||||
(inferred_parameters (identifier) @definition.var) ; (x,y) -> ...
|
|
||||||
(lambda_expression
|
|
||||||
parameters: (identifier) @definition.var) ; x -> ...
|
|
||||||
(enhanced_for_statement ; for (var item : items) {
|
(enhanced_for_statement ; for (var item : items) {
|
||||||
name: (identifier) @definition.var)
|
name: (identifier) @definition.var)
|
||||||
|
|
||||||
|
(formal_parameter
|
||||||
|
name: (identifier) @definition.parameter)
|
||||||
|
(catch_formal_parameter
|
||||||
|
name: (identifier) @definition.parameter)
|
||||||
|
(inferred_parameters (identifier) @definition.parameter) ; (x,y) -> ...
|
||||||
|
(lambda_expression
|
||||||
|
parameters: (identifier) @definition.parameter) ; x -> ...
|
||||||
|
|
||||||
((scoped_identifier
|
((scoped_identifier
|
||||||
(identifier) @definition.import)
|
(identifier) @definition.import)
|
||||||
(#has-ancestor? @definition.import import_declaration))
|
(#has-ancestor? @definition.import import_declaration))
|
||||||
|
|
@ -72,6 +82,8 @@
|
||||||
declarator: (variable_declarator
|
declarator: (variable_declarator
|
||||||
name: (identifier) @definition.field))
|
name: (identifier) @definition.field))
|
||||||
|
|
||||||
; REFERENCES
|
;; REFERENCES
|
||||||
|
|
||||||
(identifier) @reference
|
(identifier) @reference
|
||||||
|
|
||||||
(type_identifier) @reference
|
(type_identifier) @reference
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue