benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-08 14:30:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update locals with support for deep pattern matches

Browse source
This commit is contained in:
Connor Lay (Clay) 2021-10-06 22:11:09 -07:00 • committed by Stephan Seitz
parent 259e3f6e64
commit 1413f62c88
2 changed files with 66 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

7
queries/elixir/highlights.scm
View file

@ -19,6 +19,9 @@
"%"
] @punctuation.special
; Parser errors
(ERROR) @error
; Identifiers
(identifier) @variable
@ -201,7 +204,7 @@
quoted_end: _ @comment) @comment
(boolean) @comment
]))
(#any-of? @_identifier "moduledoc" "typedoc" "doc"))
(#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
; Sigils
(sigil
@ -220,5 +223,3 @@
((sigil_modifiers) @string)?
(#any-of? @_sigil_name "s" "S")) @string
; Parser errors
(ERROR) @error

134
queries/elixir/locals.scm
View file

@ -1,80 +1,70 @@
[
(after_block)
(catch_block)
(do_block)
(stab_expression)
(rescue_block)
] @scope
; Scopes
(call (do_block)) @scope
(stab_clause) @scope
; References
(identifier) @reference
(alias) @reference
; Module Definitions
(call
function: (function_identifier) @_call-name
(module) @definition.type
(#eq? @_call-name "defmodule"))
target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
(arguments (alias) @definition.type))
; Function definition without arguments
(call (function_identifier) @_call-name
(identifier) @definition.function
(#any-of? @_call-name "def" "defp" "defguard" "defguardp"))
; Local Function Definitions
; TODO: add support for test blocks
; test "foo", %{conn: conn} do
(call
target: ((identifier) @_identifier (#any-of? @_identifier "def" "defp" "defmacro" "defmacrop" "defguard" "defguardp" "defn" "defnp" "for"))
(arguments [
(identifier) @definition.function
(binary_operator left: (identifier) @definition.function)
(call target: (identifier) @definition.function (arguments [
(identifier) @definition.parameter
(_ (identifier) @definition.parameter)
(_ (_ (identifier) @definition.parameter))
(_ (_ (_ (identifier) @definition.parameter)))
(_ (_ (_ (_ (identifier) @definition.parameter))))
(_ (_ (_ (_ (_ (identifier) @definition.parameter)))))
(_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))
(_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))
]))
]?) (#set! definition.function.scope parent))
; Function definition with arguments
(call (function_identifier) @_call-name
(call
function: (function_identifier) @definition.function
(arguments
[(identifier) @definition.parameter
(tuple (identifier) @definition.parameter)
(list (identifier) @definition.parameter)
(_
(keyword_list (identifier) @definition.parameter))
(binary_op
left: (identifier) @definition.parameter
operator: "\\\\")]))
(#any-of? @_call-name "def" "defp"))
; Pattern Match Definitions
(binary_operator left: [
(identifier) @definition.var
(_ (identifier) @definition.var)
(_ (_ (identifier) @definition.var))
(_ (_ (_ (identifier) @definition.var)))
(_ (_ (_ (_ (identifier) @definition.var))))
(_ (_ (_ (_ (_ (identifier) @definition.var)))))
(_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))
(_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))
] operator: "=")
; Function definition with (some) arguments and guard(s)
(call (function_identifier) @_call-name
(binary_op
left:
(call
function: (function_identifier) @definition.function
(arguments
[(identifier) @definition.parameter
(tuple (identifier) @definition.parameter)
(list (identifier) @definition.parameter)
(_
(keyword_list (identifier) @definition.parameter))]))
operator: "when")
(#any-of? @_call-name "def" "defp" "defguard" "defguardp"))
; Stab Clause Definitions
(stab_clause left: [
(_ (identifier) @definition.var)
(_ (_ (identifier) @definition.var))
(_ (_ (_ (identifier) @definition.var)))
(_ (_ (_ (_ (identifier) @definition.var))))
(_ (_ (_ (_ (_ (identifier) @definition.var)))))
(_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))
(_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))
])
; Variable assignment and simple pattern matching
(binary_op
left:
[(identifier) @definition.var
(tuple (identifier) @definition.var)
(list (identifier) @definition.var)
(_
(keyword_list (identifier) @definition.var))]
operator: "=")
; Simple stab expression (ex. case pattern matching) without guard(s)
(stab_expression
left:
(bare_arguments
[(identifier) @definition.var
(tuple (identifier) @definition.var)
(list (identifier) @definition.var)
(_
(keyword_list (identifier) @definition.var))]))
; Simple stab expression (ex. case pattern matching) with guard(s)
(stab_expression
left:
(bare_arguments
(binary_op
left: [(identifier) @definition.var
(tuple (identifier) @definition.var)
(list (identifier) @definition.var)
(_
(keyword_list (identifier) @definition.var))])))
; Aliases
(call
target: ((identifier) @_identifier (#any-of? @_identifier "require" "alias" "use" "import"))
(arguments [
(alias) @definition.import
(_ (alias) @definition.import)
(_ (_ (alias) @definition.import))
(_ (_ (_ (alias) @definition.import)))
(_ (_ (_ (_ (alias) @definition.import))))
(_ (_ (_ (_ (_ (alias) @definition.import)))))
(_ (_ (_ (_ (_ (_ (alias) @definition.import))))))
(_ (_ (_ (_ (_ (_ (_ (alias) @definition.import)))))))
]
))