)
+--- - type of arguments that needs to be passed to the vim command
+--- - {args}: (string, optional)
+--- - vim command attributes
+---
+---Example:
+--- If module is nvim-treesitter.custom_mod
+---
+--- M.commands = {
+--- custom_command = {
+--- run = M.module_function,
+--- f_args = "",
+--- args = {
+--- "-range"
+--- }
+--- }
+--- }
+---
+--- utils.setup_commands("custom_mod", require("nvim-treesitter.custom_mod").commands)
+---
+---
+--- Will generate command :
+---
+--- command! -range custom_command \
+--- lua require'nvim-treesitter.custom_mod'.commands.custom_command['run']()
+---
+function M.setup_commands(mod, commands)
+ for command_name, def in pairs(commands) do
+ local f_args = def.f_args or ""
+ local call_fn =
+ string.format("lua require'nvim-treesitter.%s'.commands.%s['run'](%s)", mod, command_name, f_args)
+ local parts = vim.tbl_flatten {
+ "command!",
+ "-bar",
+ def.args,
+ command_name,
+ call_fn,
+ }
+ api.nvim_command(table.concat(parts, " "))
+ end
+end
+
+---@param dir string
+---@param create_err string
+---@param writeable_err string
+---@return string|nil, string|nil
+function M.create_or_reuse_writable_dir(dir, create_err, writeable_err)
+ create_err = create_err or M.join_space("Could not create dir '", dir, "': ")
+ writeable_err = writeable_err or M.join_space("Invalid rights, '", dir, "' should be read/write")
+ -- Try creating and using parser_dir if it doesn't exist
+ if not luv.fs_stat(dir) then
+ local ok, error = pcall(vim.fn.mkdir, dir, "p", "0755")
+ if not ok then
+ return nil, M.join_space(create_err, error)
+ end
+
+ return dir
+ end
+
+ -- parser_dir exists, use it if it's read/write
+ if luv.fs_access(dir, "RW") then
+ return dir
+ end
+
+ -- parser_dir exists but isn't read/write, give up
+ return nil, M.join_space(writeable_err, dir, "'")
+end
+
+function M.get_package_path()
+ -- Path to this source file, removing the leading '@'
+ local source = string.sub(debug.getinfo(1, "S").source, 2)
+
+ -- Path to the package root
+ return fn.fnamemodify(source, ":p:h:h:h")
+end
+
+function M.get_cache_dir()
+ local cache_dir = fn.stdpath "data"
+
+ if luv.fs_access(cache_dir, "RW") then
+ return cache_dir
+ elseif luv.fs_access("/tmp", "RW") then
+ return "/tmp"
+ end
+
+ return nil, M.join_space("Invalid cache rights,", fn.stdpath "data", "or /tmp should be read/write")
+end
+
+-- Returns $XDG_DATA_HOME/nvim/site, but could use any directory that is in
+-- runtimepath
+function M.get_site_dir()
+ return M.join_path(fn.stdpath "data", "site")
+end
+
+-- Gets a property at path
+-- @param tbl the table to access
+-- @param path the '.' separated path
+-- @returns the value at path or nil
+function M.get_at_path(tbl, path)
+ if path == "" then
+ return tbl
+ end
+ local segments = vim.split(path, ".", true)
+ local result = tbl
+
+ for _, segment in ipairs(segments) do
+ if type(result) == "table" then
+ result = result[segment]
+ end
+ end
+
+ return result
+end
+
+function M.set_jump()
+ vim.cmd "normal! m'"
+end
+
+function M.index_of(tbl, obj)
+ for i, o in ipairs(tbl) do
+ if o == obj then
+ return i
+ end
+ end
+end
+
+-- Filters a list based on the given predicate
+-- @param tbl The list to filter
+-- @param predicate The predicate to filter with
+function M.filter(tbl, predicate)
+ local result = {}
+
+ for i, v in ipairs(tbl) do
+ if predicate(v, i) then
+ table.insert(result, v)
+ end
+ end
+
+ return result
+end
+
+-- Returns a list of all values from the first list
+-- that are not present in the second list.
+-- @params tbl1 The first table
+-- @params tbl2 The second table
+function M.difference(tbl1, tbl2)
+ return M.filter(tbl1, function(v)
+ return not vim.tbl_contains(tbl2, v)
+ end)
+end
+
+function M.identity(a)
+ return a
+end
+
+function M.constant(a)
+ return function()
+ return a
+ end
+end
+
+function M.to_func(a)
+ return type(a) == "function" and a or M.constant(a)
+end
+
+---@return string|nil
+function M.ts_cli_version()
+ if fn.executable "tree-sitter" == 1 then
+ local handle = io.popen "tree-sitter -V"
+ local result = handle:read "*a"
+ handle:close()
+ return vim.split(result, "\n")[1]:match "[^tree%psitter ].*"
+ end
+end
+
+return M
diff --git a/parser-info/.gitignore b/parser-info/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/parser-info/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/parser/.gitignore b/parser/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/parser/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/plugin/filetypes.lua b/plugin/filetypes.lua
deleted file mode 100644
index f8fe0c287..000000000
--- a/plugin/filetypes.lua
+++ /dev/null
@@ -1,69 +0,0 @@
-local filetypes = {
- angular = { 'htmlangular' },
- bash = { 'sh' },
- bibtex = { 'bib' },
- c_sharp = { 'cs', 'csharp' },
- commonlisp = { 'lisp' },
- cooklang = { 'cook' },
- devicetree = { 'dts' },
- diff = { 'gitdiff' },
- eex = { 'eelixir' },
- elixir = { 'ex' },
- embedded_template = { 'eruby' },
- erlang = { 'erl' },
- facility = { 'fsd' },
- faust = { 'dsp' },
- gdshader = { 'gdshaderinc' },
- git_config = { 'gitconfig' },
- git_rebase = { 'gitrebase' },
- glimmer = { 'handlebars', 'html.handlebars' },
- godot_resource = { 'gdresource' },
- haskell = { 'hs' },
- haskell_persistent = { 'haskellpersistent' },
- idris = { 'idris2' },
- ini = { 'confini', 'dosini' },
- janet_simple = { 'janet' },
- javascript = { 'javascriptreact', 'ecma', 'ecmascript', 'jsx', 'js' },
- json = { 'jsonc' },
- glimmer_javascript = { 'javascript.glimmer' },
- latex = { 'tex' },
- linkerscript = { 'ld' },
- m68k = { 'asm68k' },
- make = { 'automake' },
- markdown = { 'pandoc' },
- muttrc = { 'neomuttrc' },
- ocaml_interface = { 'ocamlinterface' },
- perl = { 'pl' },
- poe_filter = { 'poefilter' },
- powershell = { 'ps1' },
- properties = { 'jproperties' },
- python = { 'py', 'gyp' },
- qmljs = { 'qml' },
- runescript = { 'clientscript' },
- scala = { 'sbt' },
- slang = { 'shaderslang' },
- sqp = { 'mysqp' },
- ssh_config = { 'sshconfig' },
- starlark = { 'bzl' },
- surface = { 'sface' },
- systemverilog = { 'verilog' },
- t32 = { 'trace32' },
- tcl = { 'expect' },
- terraform = { 'terraform-vars' },
- textproto = { 'pbtxt' },
- tlaplus = { 'tla' },
- tsx = { 'typescriptreact', 'typescript.tsx' },
- typescript = { 'ts' },
- glimmer_typescript = { 'typescript.glimmer' },
- typst = { 'typ' },
- udev = { 'udevrules' },
- uxntal = { 'tal', 'uxn' },
- v = { 'vlang' },
- vhs = { 'tape' },
- xml = { 'xsd', 'xslt', 'svg' },
- xresources = { 'xdefaults' },
-}
-
-for lang, ft in pairs(filetypes) do
- vim.treesitter.language.register(lang, ft)
-end
diff --git a/plugin/nvim-treesitter.lua b/plugin/nvim-treesitter.lua
index adeb41425..4ea3925fd 100644
--- a/plugin/nvim-treesitter.lua
+++ b/plugin/nvim-treesitter.lua
@@ -1,75 +1,34 @@
+-- Last Change: 2022 Apr 16
+
if vim.g.loaded_nvim_treesitter then
return
end
vim.g.loaded_nvim_treesitter = true
+-- setup modules
+require("nvim-treesitter").setup()
+
local api = vim.api
-local function complete_available_parsers(arglead)
- return vim.tbl_filter(
- --- @param v string
- function(v)
- return v:find(arglead) ~= nil
- end,
- require('nvim-treesitter.config').get_available()
- )
-end
+-- define autocommands
+local augroup = api.nvim_create_augroup("NvimTreesitter", {})
-local function complete_installed_parsers(arglead)
- return vim.tbl_filter(
- --- @param v string
- function(v)
- return v:find(arglead) ~= nil
- end,
- require('nvim-treesitter.config').get_installed()
- )
-end
-
--- create user commands
-api.nvim_create_user_command('TSInstall', function(args)
- require('nvim-treesitter.install').install(args.fargs, { force = args.bang, summary = true })
-end, {
- nargs = '+',
- bang = true,
- bar = true,
- complete = complete_available_parsers,
- desc = 'Install treesitter parsers',
-})
-
-api.nvim_create_user_command('TSInstallFromGrammar', function(args)
- require('nvim-treesitter.install').install(args.fargs, {
- generate = true,
- summary = true,
- force = args.bang,
- })
-end, {
- nargs = '+',
- bang = true,
- bar = true,
- complete = complete_available_parsers,
- desc = 'Install treesitter parsers from grammar',
-})
-
-api.nvim_create_user_command('TSUpdate', function(args)
- require('nvim-treesitter.install').update(args.fargs, { summary = true })
-end, {
- nargs = '*',
- bar = true,
- complete = complete_installed_parsers,
- desc = 'Update installed treesitter parsers',
-})
-
-api.nvim_create_user_command('TSUninstall', function(args)
- require('nvim-treesitter.install').uninstall(args.fargs, { summary = true })
-end, {
- nargs = '+',
- bar = true,
- complete = complete_installed_parsers,
- desc = 'Uninstall treesitter parsers',
-})
-
-api.nvim_create_user_command('TSLog', function()
- require('nvim-treesitter.log').show()
-end, {
- desc = 'View log messages',
+api.nvim_create_autocmd("Filetype", {
+ pattern = "query",
+ group = augroup,
+ callback = function()
+ api.nvim_clear_autocmds {
+ group = augroup,
+ event = "BufWritePost",
+ }
+ api.nvim_create_autocmd("BufWritePost", {
+ group = augroup,
+ buffer = 0,
+ callback = function(opts)
+ require("nvim-treesitter.query").invalidate_query_file(opts.file)
+ end,
+ desc = "Invalidate query file",
+ })
+ end,
+ desc = "Reload query",
})
diff --git a/plugin/query_predicates.lua b/plugin/query_predicates.lua
deleted file mode 100644
index 6511d3104..000000000
--- a/plugin/query_predicates.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-local query = vim.treesitter.query
-
-local predicates = {
- ---@param match table
- ---@param pred any[]
- ---@param any boolean
- ---@return boolean
- ['kind-eq'] = function(match, pred, any)
- local nodes = match[pred[2]]
- if not nodes or #nodes == 0 then
- return true
- end
-
- local types = { unpack(pred, 3) }
- for _, node in ipairs(nodes) do
- local res = vim.list_contains(types, node:type())
- if any and res then
- return true
- elseif not any and not res then
- return false
- end
- end
- return not any
- end,
-}
-
--- register custom predicates (overwrite existing; needed for CI)
-
----@param match table
----@param pred any[]
----@return boolean
-query.add_predicate('kind-eq?', function(match, _, _, pred)
- return predicates['kind-eq'](match, pred, false)
-end, { force = true })
-
----@param match table
----@param pred any[]
----@return boolean
-query.add_predicate('any-kind-eq?', function(match, _, _, pred)
- return predicates['kind-eq'](match, pred, true)
-end, { force = true })
diff --git a/queries/agda/folds.scm b/queries/agda/folds.scm
new file mode 100644
index 000000000..e3258efb9
--- /dev/null
+++ b/queries/agda/folds.scm
@@ -0,0 +1,4 @@
+[
+ (record)
+ (module)
+] @fold
diff --git a/queries/agda/highlights.scm b/queries/agda/highlights.scm
new file mode 100644
index 000000000..ed208f1b6
--- /dev/null
+++ b/queries/agda/highlights.scm
@@ -0,0 +1,82 @@
+
+;; Constants
+(integer) @number
+
+;; Variables and Symbols
+
+(typed_binding (atom (qid) @variable))
+(untyped_binding) @variable
+(typed_binding (expr) @type)
+
+(id) @function
+(bid) @function
+
+(function_name (atom (qid) @function))
+(field_name) @function
+
+
+[(data_name) (record_name)] @constructor
+
+; Set
+(SetN) @type.builtin
+
+(expr . (atom) @function)
+
+((atom) @boolean
+ (#any-of? @boolean "true" "false" "True" "False"))
+
+;; Imports and Module Declarations
+
+"import" @include
+
+(module_name) @namespace
+
+;; Pragmas and comments
+
+(pragma) @preproc
+
+(comment) @comment
+
+;; Keywords
+[
+ "where"
+ "data"
+ "rewrite"
+ "postulate"
+ "public"
+ "private"
+ "tactic"
+ "Prop"
+ "quote"
+ "renaming"
+ "open"
+ "in"
+ "hiding"
+ "constructor"
+ "abstract"
+ "let"
+ "field"
+ "mutual"
+ "module"
+ "infix"
+ "infixl"
+ "infixr"
+ "record"
+ (ARROW)
+]
+@keyword
+
+;;;(expr
+;;; f_name: (atom) @function)
+;; Brackets
+
+[
+ "("
+ ")"
+ "{"
+ "}"]
+@punctuation.bracket
+
+[
+ "="
+] @operator
diff --git a/runtime/queries/arduino/folds.scm b/queries/arduino/folds.scm
similarity index 100%
rename from runtime/queries/arduino/folds.scm
rename to queries/arduino/folds.scm
diff --git a/queries/arduino/highlights.scm b/queries/arduino/highlights.scm
new file mode 100644
index 000000000..a4e74ae89
--- /dev/null
+++ b/queries/arduino/highlights.scm
@@ -0,0 +1,111 @@
+; inherits: cpp
+
+((identifier) @function.builtin
+ (#any-of? @function.builtin
+ ; Digital I/O
+ "digitalRead"
+ "digitalWrite"
+ "pinMode"
+ ; Analog I/O
+ "analogRead"
+ "analogReference"
+ "analogWrite"
+ ; Zero, Due & MKR Family
+ "analogReadResolution"
+ "analogWriteResolution"
+ ; Advanced I/O
+ "noTone"
+ "pulseIn"
+ "pulseInLong"
+ "shiftIn"
+ "shiftOut"
+ "tone"
+ ; Time
+ "delay"
+ "delayMicroseconds"
+ "micros"
+ "millis"
+ ; Math
+ "abs"
+ "constrain"
+ "map"
+ "max"
+ "min"
+ "pow"
+ "sq"
+ "sqrt"
+ ; Trigonometry
+ "cos"
+ "sin"
+ "tan"
+ ; Characters
+ "isAlpha"
+ "isAlphaNumeric"
+ "isAscii"
+ "isControl"
+ "isDigit"
+ "isGraph"
+ "isHexadecimalDigit"
+ "isLowerCase"
+ "isPrintable"
+ "isPunct"
+ "isSpace"
+ "isUpperCase"
+ "isWhitespace"
+ ; Random Numbers
+ "random"
+ "randomSeed"
+ ; Bits and Bytes
+ "bit"
+ "bitClear"
+ "bitRead"
+ "bitSet"
+ "bitWrite"
+ "highByte"
+ "lowByte"
+ ; External Interrupts
+ "attachInterrupt"
+ "detachInterrupt"
+ ; Interrupts
+ "interrupts"
+ "noInterrupts"
+ ))
+
+((identifier) @type.builtin
+ (#any-of? @type.builtin
+ "Serial"
+ "SPI"
+ "Stream"
+ "Wire"
+ "Keyboard"
+ "Mouse"
+ "String"
+ ))
+
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin
+ "HIGH"
+ "LOW"
+ "INPUT"
+ "OUTPUT"
+ "INPUT_PULLUP"
+ "LED_BUILTIN"
+ ))
+
+(function_definition
+ (function_declarator
+ declarator: (identifier) @function.builtin)
+ (#any-of? @function.builtin "loop" "setup"))
+
+(call_expression
+ function: (primitive_type) @function.builtin)
+
+(call_expression
+ function: (identifier) @constructor
+ (#any-of? @constructor "SPISettings" "String"))
+
+(declaration
+ (type_identifier) @type.builtin
+ (function_declarator
+ declarator: (identifier) @constructor)
+ (#eq? @type.builtin "SPISettings"))
diff --git a/runtime/queries/arduino/indents.scm b/queries/arduino/indents.scm
similarity index 100%
rename from runtime/queries/arduino/indents.scm
rename to queries/arduino/indents.scm
diff --git a/queries/arduino/injections.scm b/queries/arduino/injections.scm
new file mode 100644
index 000000000..ce1e7948a
--- /dev/null
+++ b/queries/arduino/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @arduino
+
+(comment) @comment
diff --git a/runtime/queries/arduino/locals.scm b/queries/arduino/locals.scm
similarity index 100%
rename from runtime/queries/arduino/locals.scm
rename to queries/arduino/locals.scm
diff --git a/runtime/queries/angular/folds.scm b/queries/astro/folds.scm
similarity index 100%
rename from runtime/queries/angular/folds.scm
rename to queries/astro/folds.scm
diff --git a/queries/astro/highlights.scm b/queries/astro/highlights.scm
new file mode 100644
index 000000000..62e8ed247
--- /dev/null
+++ b/queries/astro/highlights.scm
@@ -0,0 +1,5 @@
+; inherits: html
+
+[ "---" ] @punctuation.delimiter
+
+[ "{" "}" ] @punctuation.special
diff --git a/runtime/queries/astro/indents.scm b/queries/astro/indents.scm
similarity index 100%
rename from runtime/queries/astro/indents.scm
rename to queries/astro/indents.scm
diff --git a/queries/astro/injections.scm b/queries/astro/injections.scm
new file mode 100644
index 000000000..95869e27c
--- /dev/null
+++ b/queries/astro/injections.scm
@@ -0,0 +1,10 @@
+; inherits: html
+
+((frontmatter
+ (raw_text) @typescript))
+
+((interpolation
+ (raw_text) @tsx))
+
+((script_element
+ (raw_text) @typescript))
diff --git a/runtime/queries/angular/locals.scm b/queries/astro/locals.scm
similarity index 100%
rename from runtime/queries/angular/locals.scm
rename to queries/astro/locals.scm
diff --git a/queries/awk/highlights.scm b/queries/awk/highlights.scm
new file mode 100644
index 000000000..a03c43670
--- /dev/null
+++ b/queries/awk/highlights.scm
@@ -0,0 +1,154 @@
+; adapted from https://github.com/Beaglefoot/tree-sitter-awk
+
+[
+ (identifier)
+ (field_ref)
+] @variable
+(field_ref (_) @variable)
+
+(number) @number
+
+(string) @string
+(regex) @string.regex
+(escape_sequence) @string.escape
+
+(comment) @comment @spell
+
+(ns_qualified_name (namespace) @namespace)
+(ns_qualified_name "::" @punctuation.delimiter)
+
+(func_def name: (_ (identifier) @function) @function)
+(func_call name: (_ (identifier) @function) @function)
+
+(func_def (param_list (identifier) @parameter))
+
+[
+ "print"
+ "printf"
+ "getline"
+] @function.builtin
+
+[
+ (delete_statement)
+ (break_statement)
+ (continue_statement)
+ (next_statement)
+ (nextfile_statement)
+] @keyword
+
+[
+ "func"
+ "function"
+] @keyword.function
+
+[
+ "return"
+ "exit"
+] @keyword.return
+
+[
+ "do"
+ "while"
+ "for"
+ "in"
+] @repeat
+
+[
+ "if"
+ "else"
+ "switch"
+ "case"
+ "default"
+] @conditional
+
+[
+ "@include"
+ "@load"
+] @include
+
+"@namespace" @preproc
+
+[
+ "BEGIN"
+ "END"
+ "BEGINFILE"
+ "ENDFILE"
+] @label
+
+(binary_exp [
+ "^"
+ "**"
+ "*"
+ "/"
+ "%"
+ "+"
+ "-"
+ "<"
+ ">"
+ "<="
+ ">="
+ "=="
+ "!="
+ "~"
+ "!~"
+ "in"
+ "&&"
+ "||"
+] @operator)
+
+(unary_exp [
+ "!"
+ "+"
+ "-"
+] @operator)
+
+(assignment_exp [
+ "="
+ "+="
+ "-="
+ "*="
+ "/="
+ "%="
+ "^="
+] @operator)
+
+(ternary_exp [
+ "?"
+ ":"
+] @conditional.ternary)
+
+(update_exp [
+ "++"
+ "--"
+] @operator)
+
+(redirected_io_statement [
+ ">"
+ ">>"
+] @operator)
+
+(piped_io_statement [
+ "|"
+ "|&"
+] @operator)
+
+(piped_io_exp [
+ "|"
+ "|&"
+] @operator)
+
+(field_ref "$" @punctuation.delimiter)
+
+(regex "/" @punctuation.delimiter)
+(regex_constant "@" @punctuation.delimiter)
+
+[ ";" "," ] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
diff --git a/queries/awk/injections.scm b/queries/awk/injections.scm
new file mode 100644
index 000000000..8cbffc623
--- /dev/null
+++ b/queries/awk/injections.scm
@@ -0,0 +1,2 @@
+(comment) @comment
+(regex) @regex
diff --git a/runtime/queries/bash/folds.scm b/queries/bash/folds.scm
similarity index 86%
rename from runtime/queries/bash/folds.scm
rename to queries/bash/folds.scm
index 766dbe598..851c67eed 100644
--- a/runtime/queries/bash/folds.scm
+++ b/queries/bash/folds.scm
@@ -5,5 +5,4 @@
(for_statement)
(while_statement)
(c_style_for_statement)
- (heredoc_redirect)
] @fold
diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
new file mode 100644
index 000000000..d1cdb659d
--- /dev/null
+++ b/queries/bash/highlights.scm
@@ -0,0 +1,136 @@
+(simple_expansion) @none
+(expansion
+ "${" @punctuation.special
+ "}" @punctuation.special) @none
+[
+ "("
+ ")"
+ "(("
+ "))"
+ "{"
+ "}"
+ "["
+ "]"
+ "[["
+ "]]"
+ ] @punctuation.bracket
+
+[
+ ";"
+ ";;"
+ (heredoc_start)
+ ] @punctuation.delimiter
+
+[
+ "$"
+] @punctuation.special
+
+[
+ ">"
+ ">>"
+ "<"
+ "<<"
+ "&"
+ "&&"
+ "|"
+ "||"
+ "="
+ "=~"
+ "=="
+ "!="
+ ] @operator
+
+[
+ (string)
+ (raw_string)
+ (ansi_c_string)
+ (heredoc_body)
+] @string @spell
+
+(variable_assignment (word) @string)
+
+[
+ "if"
+ "then"
+ "else"
+ "elif"
+ "fi"
+ "case"
+ "in"
+ "esac"
+ ] @conditional
+
+[
+ "for"
+ "do"
+ "done"
+ "while"
+ ] @repeat
+
+[
+ "declare"
+ "export"
+ "local"
+ "readonly"
+ "unset"
+ ] @keyword
+
+"function" @keyword.function
+
+(special_variable_name) @constant
+
+; trap -l
+((word) @constant.builtin
+ (#match? @constant.builtin "^SIG(HUP|INT|QUIT|ILL|TRAP|ABRT|BUS|FPE|KILL|USR[12]|SEGV|PIPE|ALRM|TERM|STKFLT|CHLD|CONT|STOP|TSTP|TT(IN|OU)|URG|XCPU|XFSZ|VTALRM|PROF|WINCH|IO|PWR|SYS|RTMIN([+]([1-9]|1[0-5]))?|RTMAX(-([1-9]|1[0-4]))?)$"))
+
+((word) @boolean
+ (#match? @boolean "^(true|false)$"))
+
+(comment) @comment @spell
+(test_operator) @string
+
+(command_substitution
+ [ "$(" ")" ] @punctuation.bracket)
+
+(process_substitution
+ [ "<(" ")" ] @punctuation.bracket)
+
+
+(function_definition
+ name: (word) @function)
+
+(command_name (word) @function.call)
+
+((command_name (word) @function.builtin)
+ (#any-of? @function.builtin
+ "alias" "cd" "clear" "echo" "eval" "exit" "getopts" "popd"
+ "pushd" "return" "set" "shift" "shopt" "source" "test"))
+
+(command
+ argument: [
+ (word) @parameter
+ (concatenation (word) @parameter)
+ ])
+
+((word) @number
+ (#lua-match? @number "^[0-9]+$"))
+
+(file_redirect
+ descriptor: (file_descriptor) @operator
+ destination: (word) @parameter)
+
+(expansion
+ [ "${" "}" ] @punctuation.bracket)
+
+(variable_name) @variable
+
+((variable_name) @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+
+(case_item
+ value: (word) @parameter)
+
+(regex) @string.regex
+
+((program . (comment) @preproc)
+ (#match? @preproc "^#!/"))
diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
new file mode 100644
index 000000000..86371b905
--- /dev/null
+++ b/queries/bash/injections.scm
@@ -0,0 +1,3 @@
+(comment) @comment
+
+(regex) @regex
diff --git a/queries/bash/locals.scm b/queries/bash/locals.scm
new file mode 100644
index 000000000..a03bc3a56
--- /dev/null
+++ b/queries/bash/locals.scm
@@ -0,0 +1,13 @@
+; Scopes
+(function_definition) @scope
+
+; Definitions
+(variable_assignment
+ name: (variable_name) @definition.var)
+
+(function_definition
+ name: (word) @definition.function)
+
+; References
+(variable_name) @reference
+(word) @reference
diff --git a/queries/beancount/folds.scm b/queries/beancount/folds.scm
new file mode 100644
index 000000000..ffe319500
--- /dev/null
+++ b/queries/beancount/folds.scm
@@ -0,0 +1,4 @@
+[
+ (transaction)
+ (section)
+] @fold
diff --git a/queries/beancount/highlights.scm b/queries/beancount/highlights.scm
new file mode 100644
index 000000000..7fa78d84e
--- /dev/null
+++ b/queries/beancount/highlights.scm
@@ -0,0 +1,26 @@
+
+(date) @field
+(txn) @attribute
+
+(account) @type
+
+(amount) @number
+(incomplete_amount) @number
+(amount_tolerance) @number
+
+(currency) @property
+
+(key) @label
+(string) @string
+
+(tag) @constant
+(link) @constant
+
+(comment) @comment
+
+[
+ (balance) (open) (close) (commodity) (pad)
+ (event) (price) (note) (document) (query)
+ (custom) (pushtag) (poptag) (pushmeta)
+ (popmeta) (option) (include) (plugin)
+] @keyword
diff --git a/queries/bibtex/folds.scm b/queries/bibtex/folds.scm
new file mode 100644
index 000000000..3b24d5fea
--- /dev/null
+++ b/queries/bibtex/folds.scm
@@ -0,0 +1,3 @@
+[
+ (entry)
+] @fold
diff --git a/runtime/queries/bibtex/highlights.scm b/queries/bibtex/highlights.scm
similarity index 65%
rename from runtime/queries/bibtex/highlights.scm
rename to queries/bibtex/highlights.scm
index 2231a17db..00cae314d 100644
--- a/runtime/queries/bibtex/highlights.scm
+++ b/queries/bibtex/highlights.scm
@@ -1,4 +1,5 @@
; CREDITS @pfoerster (adapted from https://github.com/latex-lsp/tree-sitter-bibtex)
+
[
(string_type)
(preamble_type)
@@ -10,8 +11,6 @@
(comment)
] @comment
-(comment) @spell
-
[
"="
"#"
@@ -22,27 +21,20 @@
(number) @number
(field
- name: (identifier) @property)
+ name: (identifier) @field)
(token
- (identifier) @variable.parameter)
+ (identifier) @parameter)
[
(brace_word)
(quote_word)
] @string
-((field
- name: (identifier) @_url
- value: (value
- (token
- (brace_word) @string.special.url)))
- (#any-of? @_url "url" "doi"))
-
[
(key_brace)
(key_paren)
-] @markup.link.label
+] @symbol
(string
name: (identifier) @constant)
diff --git a/queries/bibtex/indents.scm b/queries/bibtex/indents.scm
new file mode 100644
index 000000000..af652160e
--- /dev/null
+++ b/queries/bibtex/indents.scm
@@ -0,0 +1,10 @@
+[
+ (entry)
+] @indent
+
+[
+ "{"
+ "}"
+] @branch
+
+(comment) @ignore
diff --git a/queries/blueprint/highlights.scm b/queries/blueprint/highlights.scm
new file mode 100644
index 000000000..3d4b48266
--- /dev/null
+++ b/queries/blueprint/highlights.scm
@@ -0,0 +1,57 @@
+(object_id) @variable
+
+(string) @string
+(escape_sequence) @string.escape
+
+(comment) @comment
+
+(constant) @constant.builtin
+
+(boolean) @boolean
+
+(using) @include
+
+(template) @keyword
+
+(decorator) @attribute
+
+(property_definition (property_name) @property)
+
+(object) @type
+
+(signal_binding (signal_name) @function.builtin)
+(signal_binding (function (identifier)) @function)
+(signal_binding "swapped" @keyword)
+
+(styles_list "styles" @function.macro)
+(layout_definition "layout" @function.macro)
+
+(gettext_string "_" @function.builtin)
+
+(menu_definition "menu" @keyword)
+(menu_section "section" @keyword)
+(menu_item "item" @function.macro)
+
+(template_definition (template_name_qualifier) @type.qualifier)
+
+(import_statement (gobject_library) @namespace)
+
+(import_statement (version_number) @float)
+
+(float) @float
+(number) @number
+
+[
+ ";"
+ "."
+ ","
+] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
diff --git a/queries/c/folds.scm b/queries/c/folds.scm
new file mode 100644
index 000000000..80c3039b6
--- /dev/null
+++ b/queries/c/folds.scm
@@ -0,0 +1,19 @@
+[
+ (for_statement)
+ (if_statement)
+ (while_statement)
+ (switch_statement)
+ (case_statement)
+ (function_definition)
+ (struct_specifier)
+ (enum_specifier)
+ (comment)
+ (preproc_if)
+ (preproc_elif)
+ (preproc_else)
+ (preproc_ifdef)
+ (initializer_list)
+] @fold
+
+ (compound_statement
+ (compound_statement) @fold)
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
new file mode 100644
index 000000000..f1cff7467
--- /dev/null
+++ b/queries/c/highlights.scm
@@ -0,0 +1,199 @@
+; Lower priority to prefer @parameter when identifier appears in parameter_declaration.
+((identifier) @variable (#set! "priority" 95))
+
+[
+ "default"
+ "enum"
+ "struct"
+ "typedef"
+ "union"
+ "goto"
+] @keyword
+
+"sizeof" @keyword.operator
+
+"return" @keyword.return
+
+[
+ "while"
+ "for"
+ "do"
+ "continue"
+ "break"
+] @repeat
+
+[
+ "if"
+ "else"
+ "case"
+ "switch"
+] @conditional
+
+[
+ "#if"
+ "#ifdef"
+ "#ifndef"
+ "#else"
+ "#elif"
+ "#endif"
+ (preproc_directive)
+] @preproc
+
+"#define" @define
+
+"#include" @include
+
+[ ";" ":" "," ] @punctuation.delimiter
+
+"..." @punctuation.special
+
+[ "(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
+[
+ "="
+
+ "-"
+ "*"
+ "/"
+ "+"
+ "%"
+
+ "~"
+ "|"
+ "&"
+ "^"
+ "<<"
+ ">>"
+
+ "->"
+ "."
+
+ "<"
+ "<="
+ ">="
+ ">"
+ "=="
+ "!="
+
+ "!"
+ "&&"
+ "||"
+
+ "-="
+ "+="
+ "*="
+ "/="
+ "%="
+ "|="
+ "&="
+ "^="
+ ">>="
+ "<<="
+ "--"
+ "++"
+] @operator
+
+;; Make sure the comma operator is given a highlight group after the comma
+;; punctuator so the operator is highlighted properly.
+(comma_expression [ "," ] @operator)
+
+[
+ (true)
+ (false)
+] @boolean
+
+(conditional_expression [ "?" ":" ] @conditional.ternary)
+
+(string_literal) @string
+(system_lib_string) @string
+(escape_sequence) @string.escape
+
+(null) @constant.builtin
+(number_literal) @number
+(char_literal) @character
+
+[
+ (preproc_arg)
+ (preproc_defined)
+] @function.macro
+
+(((field_expression
+ (field_identifier) @property)) @_parent
+ (#not-has-parent? @_parent template_method function_declarator call_expression))
+
+(field_designator) @property
+(((field_identifier) @property)
+ (#has-ancestor? @property field_declaration)
+ (#not-has-ancestor? @property function_declarator))
+
+(statement_identifier) @label
+
+[
+ (type_identifier)
+ (sized_type_specifier)
+ (type_descriptor)
+] @type
+
+(storage_class_specifier) @storageclass
+
+(type_qualifier) @type.qualifier
+
+(type_definition
+ declarator: (type_identifier) @type.definition)
+
+(primitive_type) @type.builtin
+
+((identifier) @constant
+ (#lua-match? @constant "^[A-Z][A-Z0-9_]+$"))
+(enumerator
+ name: (identifier) @constant)
+(case_statement
+ value: (identifier) @constant)
+
+((identifier) @constant.builtin
+ (#any-of? @constant.builtin "stderr" "stdin" "stdout"))
+
+;; Preproc def / undef
+(preproc_def
+ name: (_) @constant)
+(preproc_call
+ directive: (preproc_directive) @_u
+ argument: (_) @constant
+ (#eq? @_u "#undef"))
+
+(call_expression
+ function: (identifier) @function.call)
+(call_expression
+ function: (field_expression
+ field: (field_identifier) @function.call))
+(function_declarator
+ declarator: (identifier) @function)
+(preproc_function_def
+ name: (identifier) @function.macro)
+
+(comment) @comment @spell
+
+;; Parameters
+(parameter_declaration
+ declarator: (identifier) @parameter)
+
+(parameter_declaration
+ declarator: (pointer_declarator) @parameter)
+
+(preproc_params (identifier) @parameter)
+
+[
+ "__attribute__"
+ "__cdecl"
+ "__clrcall"
+ "__stdcall"
+ "__fastcall"
+ "__thiscall"
+ "__vectorcall"
+ "_unaligned"
+ "__unaligned"
+ "__declspec"
+ (attribute_declaration)
+] @attribute
+
+(ERROR) @error
diff --git a/queries/c/indents.scm b/queries/c/indents.scm
new file mode 100644
index 000000000..1931471b9
--- /dev/null
+++ b/queries/c/indents.scm
@@ -0,0 +1,49 @@
+[
+ (compound_statement)
+ (preproc_arg)
+ (field_declaration_list)
+ (case_statement)
+ (enumerator_list)
+ (struct_specifier)
+ (compound_literal_expression)
+ (initializer_list)
+ (while_statement)
+ (for_statement)
+ (switch_statement)
+ (expression_statement)
+] @indent
+(if_statement condition: (_) @indent)
+((if_statement
+ consequence: (_) @_consequence
+ (#not-has-type? @_consequence compound_statement)
+ ) @indent)
+(init_declarator) @indent
+
+(compound_statement "}" @indent_end)
+
+[
+ "else"
+ ")"
+ "}"
+ (statement_identifier)
+] @branch
+
+[
+ "#define"
+ "#ifdef"
+ "#if"
+ "#else"
+ "#endif"
+] @zero_indent
+
+[
+ (preproc_arg)
+ (string_literal)
+] @ignore
+
+((ERROR (parameter_declaration)) @aligned_indent
+ (#set! "delimiter" "()"))
+([(argument_list) (parameter_list)] @aligned_indent
+ (#set! "delimiter" "()"))
+
+(comment) @auto
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
new file mode 100644
index 000000000..afeb068a2
--- /dev/null
+++ b/queries/c/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @c
+
+(comment) @comment
diff --git a/queries/c/locals.scm b/queries/c/locals.scm
new file mode 100644
index 000000000..78a2180d3
--- /dev/null
+++ b/queries/c/locals.scm
@@ -0,0 +1,53 @@
+;; Functions definitions
+(function_declarator
+ declarator: (identifier) @definition.function)
+(preproc_function_def
+ name: (identifier) @definition.macro) @scope
+
+(preproc_def
+ name: (identifier) @definition.macro)
+(pointer_declarator
+ declarator: (identifier) @definition.var)
+(parameter_declaration
+ declarator: (identifier) @definition.parameter)
+(init_declarator
+ declarator: (identifier) @definition.var)
+(array_declarator
+ declarator: (identifier) @definition.var)
+(declaration
+ declarator: (identifier) @definition.var)
+(enum_specifier
+ name: (_) @definition.type
+ (enumerator_list
+ (enumerator name: (identifier) @definition.var)))
+
+;; Type / Struct / Enum
+(field_declaration
+ declarator: (field_identifier) @definition.field)
+(type_definition
+ declarator: (type_identifier) @definition.type)
+(struct_specifier
+ name: (type_identifier) @definition.type)
+
+;; goto
+(labeled_statement (statement_identifier) @definition)
+
+;; References
+(identifier) @reference
+((field_identifier) @reference
+ (set! reference.kind "field"))
+((type_identifier) @reference
+ (set! reference.kind "type"))
+
+(goto_statement (statement_identifier) @reference)
+
+;; Scope
+[
+ (for_statement)
+ (if_statement)
+ (while_statement)
+ (translation_unit)
+ (function_definition)
+ (compound_statement) ; a block in curly braces
+ (struct_specifier)
+] @scope
diff --git a/queries/c_sharp/folds.scm b/queries/c_sharp/folds.scm
new file mode 100644
index 000000000..4b5d94270
--- /dev/null
+++ b/queries/c_sharp/folds.scm
@@ -0,0 +1,15 @@
+body: [
+ (declaration_list)
+ (switch_body)
+ (enum_member_declaration_list)
+] @fold
+
+accessors: [
+ (accessor_list)
+] @fold
+
+initializer: [
+ (initializer_expression)
+] @fold
+
+(block) @fold
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
new file mode 100644
index 000000000..3ecdffb6e
--- /dev/null
+++ b/queries/c_sharp/highlights.scm
@@ -0,0 +1,399 @@
+(identifier) @variable
+
+((identifier) @keyword
+ (#eq? @keyword "value")
+ (#has-ancestor? @keyword accessor_declaration))
+
+(method_declaration
+ name: (identifier) @method)
+
+(local_function_statement
+ name: (identifier) @method)
+
+(method_declaration
+ type: (identifier) @type)
+
+(local_function_statement
+ type: (identifier) @type)
+
+(interpolation) @none
+
+(invocation_expression
+ (member_access_expression
+ name: (identifier) @method.call))
+
+(invocation_expression
+ function: (conditional_access_expression
+ (member_binding_expression
+ name: (identifier) @method.call)))
+
+(namespace_declaration
+ name: [(qualified_name) (identifier)] @namespace)
+
+(qualified_name
+ (identifier) @type)
+
+(invocation_expression
+ (identifier) @method.call)
+
+(field_declaration
+ (variable_declaration
+ (variable_declarator
+ (identifier) @field)))
+
+(initializer_expression
+ (assignment_expression
+ left: (identifier) @field))
+
+(parameter_list
+ (parameter
+ name: (identifier) @parameter))
+
+(parameter_list
+ (parameter
+ type: (identifier) @type))
+
+(integer_literal) @number
+(real_literal) @float
+
+(null_literal) @constant.builtin
+(character_literal) @character
+
+[
+ (string_literal)
+ (verbatim_string_literal)
+ (interpolated_string_expression)
+] @string
+
+(boolean_literal) @boolean
+
+[
+ (predefined_type)
+ (void_keyword)
+] @type.builtin
+
+(implicit_type) @keyword
+
+(comment) @comment @spell
+
+(using_directive
+ (identifier) @type)
+
+(using_directive
+ (name_equals (identifier) @type.definition))
+
+(property_declaration
+ name: (identifier) @property)
+
+(property_declaration
+ type: (identifier) @type)
+
+(nullable_type
+ (identifier) @type)
+
+(catch_declaration
+ type: (identifier) @type)
+
+(interface_declaration
+ name: (identifier) @type)
+(class_declaration
+ name: (identifier) @type)
+(record_declaration
+ name: (identifier) @type)
+(enum_declaration
+ name: (identifier) @type)
+(constructor_declaration
+ name: (identifier) @constructor)
+(constructor_initializer [
+ "base" @constructor
+])
+
+(variable_declaration
+ (identifier) @type)
+(object_creation_expression
+ (identifier) @type)
+
+; Generic Types.
+(type_of_expression
+ (generic_name
+ (identifier) @type))
+
+(type_argument_list
+ (generic_name
+ (identifier) @type))
+
+(base_list
+ (generic_name
+ (identifier) @type))
+
+(type_constraint
+ (generic_name
+ (identifier) @type))
+
+(object_creation_expression
+ (generic_name
+ (identifier) @type))
+
+(property_declaration
+ (generic_name
+ (identifier) @type))
+
+(_
+ type: (generic_name
+ (identifier) @type))
+; Generic Method invocation with generic type
+(invocation_expression
+ function: (generic_name
+ . (identifier) @method.call))
+
+(invocation_expression
+ (member_access_expression
+ (generic_name
+ (identifier) @method)))
+
+(base_list
+ (identifier) @type)
+
+(type_argument_list
+ (identifier) @type)
+
+(type_parameter_list
+ (type_parameter) @type)
+
+(type_parameter_constraints_clause
+ target: (identifier) @type)
+
+(attribute
+ name: (identifier) @attribute)
+
+(for_each_statement
+ type: (identifier) @type)
+
+(tuple_element
+ type: (identifier) @type)
+
+(tuple_expression
+ (argument
+ (declaration_expression
+ type: (identifier) @type)))
+
+(as_expression
+ right: (identifier) @type)
+
+(type_of_expression
+ (identifier) @type)
+
+(name_colon
+ (identifier) @parameter)
+
+(warning_directive) @text.warning
+(error_directive) @exception
+
+(define_directive
+ (identifier) @constant) @constant.macro
+(undef_directive
+ (identifier) @constant) @constant.macro
+
+(line_directive) @constant.macro
+(line_directive
+ (preproc_integer_literal) @constant
+ (preproc_string_literal)? @string)
+
+(pragma_directive
+ (identifier) @constant) @constant.macro
+(pragma_directive
+ (preproc_string_literal) @string) @constant.macro
+
+[
+ (nullable_directive)
+ (region_directive)
+ (endregion_directive)
+] @constant.macro
+
+[
+ "if"
+ "else"
+ "switch"
+ "break"
+ "case"
+ (if_directive)
+ (elif_directive)
+ (else_directive)
+ (endif_directive)
+] @conditional
+
+(if_directive
+ (identifier) @constant)
+(elif_directive
+ (identifier) @constant)
+
+[
+ "while"
+ "for"
+ "do"
+ "continue"
+ "goto"
+ "foreach"
+] @repeat
+
+[
+ "try"
+ "catch"
+ "throw"
+ "finally"
+] @exception
+
+[
+ "+"
+ "?"
+ ":"
+ "++"
+ "-"
+ "--"
+ "&"
+ "&&"
+ "|"
+ "||"
+ "!"
+ "!="
+ "=="
+ "*"
+ "/"
+ "%"
+ "<"
+ "<="
+ ">"
+ ">="
+ "="
+ "-="
+ "+="
+ "*="
+ "/="
+ "%="
+ "^"
+ "^="
+ "&="
+ "|="
+ "~"
+ ">>"
+ "<<"
+ "<<="
+ ">>="
+ "=>"
+] @operator
+
+[
+ ";"
+ "."
+ ","
+ ":"
+] @punctuation.delimiter
+
+[
+ "["
+ "]"
+ "{"
+ "}"
+ "("
+ ")"
+ "<"
+ ">"
+] @punctuation.bracket
+
+[
+ (this_expression)
+ (base_expression)
+] @variable.builtin
+
+[
+ "using"
+ "as"
+] @include
+
+(alias_qualified_name
+ (identifier "global") @include)
+
+[
+ "with"
+ "new"
+ "typeof"
+ "nameof"
+ "sizeof"
+ "is"
+ "and"
+ "or"
+ "not"
+ "stackalloc"
+ "in"
+ "out"
+ "ref"
+] @keyword.operator
+
+[
+ "lock"
+ "params"
+ "operator"
+ "default"
+ "implicit"
+ "explicit"
+ "override"
+ "async"
+ "await"
+ "class"
+ "delegate"
+ "enum"
+ "interface"
+ "namespace"
+ "struct"
+ "get"
+ "set"
+ "init"
+ "where"
+ "record"
+ "event"
+ "add"
+ "remove"
+ "checked"
+ "unchecked"
+ "fixed"
+] @keyword
+
+[
+ "const"
+ "extern"
+ "readonly"
+ "static"
+ "volatile"
+ "required"
+] @storageclass
+
+[
+ "abstract"
+ "private"
+ "protected"
+ "internal"
+ "public"
+ "partial"
+ "sealed"
+ "virtual"
+] @type.qualifier
+
+(parameter_modifier) @operator
+
+(query_expression
+ (_ [
+ "from"
+ "orderby"
+ "select"
+ "group"
+ "by"
+ "ascending"
+ "descending"
+ "equals"
+ "let"
+ ] @keyword))
+
+[
+ "return"
+ "yield"
+] @keyword.return
diff --git a/queries/c_sharp/injections.scm b/queries/c_sharp/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/c_sharp/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/c_sharp/locals.scm b/queries/c_sharp/locals.scm
new file mode 100644
index 000000000..c53eb1a19
--- /dev/null
+++ b/queries/c_sharp/locals.scm
@@ -0,0 +1,41 @@
+;; Definitions
+(variable_declarator
+ . (identifier) @definition.var)
+
+(variable_declarator
+ (tuple_pattern
+ (identifier) @definition.var))
+
+(declaration_expression
+ name: (identifier) @definition.var)
+
+(for_each_statement
+ left: (identifier) @definition.var)
+
+(for_each_statement
+ left: (tuple_pattern
+ (identifier) @definition.var))
+
+(parameter
+ (identifier) @definition.parameter)
+
+(method_declaration
+ name: (identifier) @definition.method)
+
+(local_function_statement
+ name: (identifier) @definition.method)
+
+(property_declaration
+ name: (identifier) @definition)
+
+(type_parameter
+ (identifier) @definition.type)
+
+(class_declaration
+ name: (identifier) @definition)
+
+;; References
+(identifier) @reference
+
+;; Scope
+(block) @scope
diff --git a/queries/clojure/folds.scm b/queries/clojure/folds.scm
new file mode 100644
index 000000000..d54daade6
--- /dev/null
+++ b/queries/clojure/folds.scm
@@ -0,0 +1 @@
+(source (list_lit) @fold)
diff --git a/queries/clojure/highlights.scm b/queries/clojure/highlights.scm
new file mode 100644
index 000000000..3dc12d531
--- /dev/null
+++ b/queries/clojure/highlights.scm
@@ -0,0 +1,344 @@
+;; >> Explanation
+;; Parsers for lisps are a bit weird in that they just return the raw forms.
+;; This means we have to do a bit of extra work in the queries to get things
+;; highlighted as they should be.
+;;
+;; For the most part this means that some things have to be assigned multiple
+;; groups.
+;; By doing this we can add a basic capture and then later refine it with more
+;; specialied captures.
+;; This can mean that sometimes things are highlighted weirdly because they
+;; have multiple highlight groups applied to them.
+
+
+;; >> Literals
+
+(
+ (dis_expr) @comment
+ (#set! "priority" 105) ; Higher priority to mark the whole sexpr as a comment
+)
+(kwd_lit) @symbol
+(str_lit) @string
+(num_lit) @number
+(char_lit) @character
+(bool_lit) @boolean
+(nil_lit) @constant.builtin
+(comment) @comment
+(regex_lit) @string.regex
+
+["'" "`"] @string.escape
+
+["~" "~@" "#"] @punctuation.special
+
+["{" "}" "[" "]" "(" ")"] @punctuation.bracket
+
+
+
+;; >> Symbols
+
+; General symbol highlighting
+(sym_lit) @variable
+
+; General function calls
+(list_lit
+ .
+ (sym_lit) @function.call)
+(anon_fn_lit
+ .
+ (sym_lit) @function.call)
+
+; Quoted symbols
+(quoting_lit
+ (sym_lit) @symbol)
+(syn_quoting_lit
+ (sym_lit) @symbol)
+
+; Used in destructure pattern
+((sym_lit) @parameter
+ (#lua-match? @parameter "^[&]"))
+
+; Inline function variables
+((sym_lit) @variable.builtin
+ (#match? @variable.builtin "^[%]"))
+
+; Constructor
+((sym_lit) @constructor
+ (#match? @constructor "^-\\>[^\\>].*"))
+
+; Dynamic variables
+((sym_lit) @variable.builtin
+ (#match? @variable.builtin "^[*].+[*]$"))
+
+; Gensym
+;; Might not be needed
+((sym_lit) @variable
+ (#match? @variable "^.*#$"))
+
+; Types
+;; TODO: improve?
+((sym_lit) @type
+ (#match? @type "^[A-Z][^/]*$"))
+;; Symbols with `.` but not `/`
+((sym_lit) @type
+ (#match? @type "^[^/]+[.][^/]*$"))
+
+; Interop
+((sym_lit) @method
+ (#match? @method "^\\.[^-]"))
+((sym_lit) @field
+ (#match? @field "^\\.-"))
+((sym_lit) @field
+ (#match? @field "^[A-Z].*/.+"))
+(list_lit
+ .
+ (sym_lit) @method
+ (#match? @method "^[A-Z].*/.+"))
+;; TODO: Special casing for the `.` macro
+
+; Operators
+((sym_lit) @operator
+ (#any-of? @operator
+ "*" "*'" "+" "+'" "-" "-'" "/"
+ "<" "<=" ">" ">=" "=" "=="))
+((sym_lit) @keyword.operator
+ (#any-of? @keyword.operator
+ "not" "not=" "and" "or"))
+
+; Definition functions
+((sym_lit) @keyword
+ (#any-of? @keyword
+ "def" "defonce" "defrecord" "defmacro" "definline"
+ "defmulti" "defmethod" "defstruct" "defprotocol"
+ "deftype"))
+((sym_lit) @keyword
+ (#eq? @keyword "declare"))
+((sym_lit) @keyword.function
+ (#match? @keyword.function "^(defn|defn-|fn|fn[*])$"))
+
+; Comment
+((sym_lit) @comment
+ (#any-of? @comment "comment"))
+
+; Conditionals
+((sym_lit) @conditional
+ (#any-of? @conditional
+ "case" "cond" "cond->" "cond->>" "condp"))
+((sym_lit) @conditional
+ (#match? @conditional "^if(\\-.*)?$"))
+((sym_lit) @conditional
+ (#match? @conditional "^when(\\-.*)?$"))
+
+; Repeats
+((sym_lit) @repeat
+ (#any-of? @repeat
+ "doseq" "dotimes" "for" "loop" "recur" "while"))
+
+; Exception
+((sym_lit) @exception
+ (#any-of? @exception
+ "throw" "try" "catch" "finally" "ex-info"))
+
+; Includes
+((sym_lit) @include
+ (#any-of? @include "ns" "import" "require" "use"))
+
+; Builtin macros
+;; TODO: Do all these items belong here?
+((sym_lit) @function.macro
+ (#any-of? @function.macro
+ "." ".." "->" "->>" "amap" "areduce" "as->" "assert"
+ "binding" "bound-fn" "delay" "do" "dosync"
+ "doto" "extend-protocol" "extend-type" "future"
+ "gen-class" "gen-interface" "io!" "lazy-cat"
+ "lazy-seq" "let" "letfn" "locking" "memfn" "monitor-enter"
+ "monitor-exit" "proxy" "proxy-super" "pvalues"
+ "refer-clojure" "reify" "set!" "some->" "some->>" "sync"
+ "time" "unquote" "unquote-splicing" "var" "vswap!"
+ "ex-cause" "ex-data" "ex-message"))
+((sym_lit) @function.macro
+ (#match? @function.macro "^with\\-.*$"))
+
+; All builtin functions
+; (->> (ns-publics *ns*)
+; (keep (fn [[s v]] (when-not (:macro (meta v)) s)))
+; sort
+; cp/print))
+;; ...and then lots of manual filtering...
+((sym_lit) @function.builtin
+ (#any-of? @function.builtin
+ "->ArrayChunk" "->Eduction" "->Vec" "->VecNode" "->VecSeq"
+ "-cache-protocol-fn" "-reset-methods" "PrintWriter-on"
+ "StackTraceElement->vec" "Throwable->map" "accessor"
+ "aclone" "add-classpath" "add-tap" "add-watch" "agent"
+ "agent-error" "agent-errors" "aget" "alength" "alias"
+ "all-ns" "alter" "alter-meta!" "alter-var-root" "ancestors"
+ "any?" "apply" "array-map" "aset" "aset-boolean" "aset-byte"
+ "aset-char" "aset-double" "aset-float" "aset-int"
+ "aset-long" "aset-short" "assoc" "assoc!" "assoc-in"
+ "associative?" "atom" "await" "await-for" "await1"
+ "bases" "bean" "bigdec" "bigint" "biginteger" "bit-and"
+ "bit-and-not" "bit-clear" "bit-flip" "bit-not" "bit-or"
+ "bit-set" "bit-shift-left" "bit-shift-right" "bit-test"
+ "bit-xor" "boolean" "boolean-array" "boolean?"
+ "booleans" "bound-fn*" "bound?" "bounded-count"
+ "butlast" "byte" "byte-array" "bytes" "bytes?"
+ "cast" "cat" "char" "char-array" "char-escape-string"
+ "char-name-string" "char?" "chars" "chunk" "chunk-append"
+ "chunk-buffer" "chunk-cons" "chunk-first" "chunk-next"
+ "chunk-rest" "chunked-seq?" "class" "class?"
+ "clear-agent-errors" "clojure-version" "coll?"
+ "commute" "comp" "comparator" "compare" "compare-and-set!"
+ "compile" "complement" "completing" "concat" "conj"
+ "conj!" "cons" "constantly" "construct-proxy" "contains?"
+ "count" "counted?" "create-ns" "create-struct" "cycle"
+ "dec" "dec'" "decimal?" "dedupe" "default-data-readers"
+ "delay?" "deliver" "denominator" "deref" "derive"
+ "descendants" "destructure" "disj" "disj!" "dissoc"
+ "dissoc!" "distinct" "distinct?" "doall" "dorun" "double"
+ "double-array" "eduction" "empty" "empty?" "ensure" "ensure-reduced"
+ "enumeration-seq" "error-handler" "error-mode" "eval"
+ "even?" "every-pred" "every?" "extend" "extenders" "extends?"
+ "false?" "ffirst" "file-seq" "filter" "filterv" "find"
+ "find-keyword" "find-ns" "find-protocol-impl"
+ "find-protocol-method" "find-var" "first" "flatten"
+ "float" "float-array" "float?" "floats" "flush" "fn?"
+ "fnext" "fnil" "force" "format" "frequencies"
+ "future-call" "future-cancel" "future-cancelled?"
+ "future-done?" "future?" "gensym" "get" "get-in"
+ "get-method" "get-proxy-class" "get-thread-bindings"
+ "get-validator" "group-by" "halt-when" "hash"
+ "hash-combine" "hash-map" "hash-ordered-coll" "hash-set"
+ "hash-unordered-coll" "ident?" "identical?" "identity"
+ "ifn?" "in-ns" "inc" "inc'" "indexed?" "init-proxy"
+ "inst-ms" "inst-ms*" "inst?" "instance?" "int" "int-array"
+ "int?" "integer?" "interleave" "intern" "interpose" "into"
+ "into-array" "ints" "isa?" "iterate" "iterator-seq" "juxt"
+ "keep" "keep-indexed" "key" "keys" "keyword" "keyword?"
+ "last" "line-seq" "list" "list*" "list?" "load" "load-file"
+ "load-reader" "load-string" "loaded-libs" "long" "long-array"
+ "longs" "macroexpand" "macroexpand-1" "make-array" "make-hierarchy"
+ "map" "map-entry?" "map-indexed" "map?" "mapcat" "mapv"
+ "max" "max-key" "memoize" "merge" "merge-with" "meta"
+ "method-sig" "methods" "min" "min-key" "mix-collection-hash"
+ "mod" "munge" "name" "namespace" "namespace-munge" "nat-int?"
+ "neg-int?" "neg?" "newline" "next" "nfirst" "nil?" "nnext"
+ "not-any?" "not-empty" "not-every?" "ns-aliases"
+ "ns-imports" "ns-interns" "ns-map" "ns-name" "ns-publics"
+ "ns-refers" "ns-resolve" "ns-unalias" "ns-unmap" "nth"
+ "nthnext" "nthrest" "num" "number?" "numerator" "object-array"
+ "odd?" "parents" "partial" "partition" "partition-all"
+ "partition-by" "pcalls" "peek" "persistent!" "pmap" "pop"
+ "pop!" "pop-thread-bindings" "pos-int?" "pos?" "pr"
+ "pr-str" "prefer-method" "prefers" "primitives-classnames"
+ "print" "print-ctor" "print-dup" "print-method" "print-simple"
+ "print-str" "printf" "println" "println-str" "prn" "prn-str"
+ "promise" "proxy-call-with-super" "proxy-mappings" "proxy-name"
+ "push-thread-bindings" "qualified-ident?" "qualified-keyword?"
+ "qualified-symbol?" "quot" "rand" "rand-int" "rand-nth" "random-sample"
+ "range" "ratio?" "rational?" "rationalize" "re-find" "re-groups"
+ "re-matcher" "re-matches" "re-pattern" "re-seq" "read"
+ "read+string" "read-line" "read-string" "reader-conditional"
+ "reader-conditional?" "realized?" "record?" "reduce"
+ "reduce-kv" "reduced" "reduced?" "reductions" "ref" "ref-history-count"
+ "ref-max-history" "ref-min-history" "ref-set" "refer"
+ "release-pending-sends" "rem" "remove" "remove-all-methods"
+ "remove-method" "remove-ns" "remove-tap" "remove-watch"
+ "repeat" "repeatedly" "replace" "replicate"
+ "requiring-resolve" "reset!" "reset-meta!" "reset-vals!"
+ "resolve" "rest" "restart-agent" "resultset-seq" "reverse"
+ "reversible?" "rseq" "rsubseq" "run!" "satisfies?"
+ "second" "select-keys" "send" "send-off" "send-via"
+ "seq" "seq?" "seqable?" "seque" "sequence" "sequential?"
+ "set" "set-agent-send-executor!" "set-agent-send-off-executor!"
+ "set-error-handler!" "set-error-mode!" "set-validator!"
+ "set?" "short" "short-array" "shorts" "shuffle"
+ "shutdown-agents" "simple-ident?" "simple-keyword?"
+ "simple-symbol?" "slurp" "some" "some-fn" "some?"
+ "sort" "sort-by" "sorted-map" "sorted-map-by"
+ "sorted-set" "sorted-set-by" "sorted?" "special-symbol?"
+ "spit" "split-at" "split-with" "str" "string?"
+ "struct" "struct-map" "subs" "subseq" "subvec" "supers"
+ "swap!" "swap-vals!" "symbol" "symbol?" "tagged-literal"
+ "tagged-literal?" "take" "take-last" "take-nth" "take-while"
+ "tap>" "test" "the-ns" "thread-bound?" "to-array"
+ "to-array-2d" "trampoline" "transduce" "transient"
+ "tree-seq" "true?" "type" "unchecked-add" "unchecked-add-int"
+ "unchecked-byte" "unchecked-char" "unchecked-dec"
+ "unchecked-dec-int" "unchecked-divide-int" "unchecked-double"
+ "unchecked-float" "unchecked-inc" "unchecked-inc-int"
+ "unchecked-int" "unchecked-long" "unchecked-multiply"
+ "unchecked-multiply-int" "unchecked-negate" "unchecked-negate-int"
+ "unchecked-remainder-int" "unchecked-short" "unchecked-subtract"
+ "unchecked-subtract-int" "underive" "unquote"
+ "unquote-splicing" "unreduced" "unsigned-bit-shift-right"
+ "update" "update-in" "update-proxy" "uri?" "uuid?"
+ "val" "vals" "var-get" "var-set" "var?" "vary-meta" "vec"
+ "vector" "vector-of" "vector?" "volatile!" "volatile?"
+ "vreset!" "with-bindings*" "with-meta" "with-redefs-fn" "xml-seq"
+ "zero?" "zipmap"))
+
+
+
+;; >> Context based highlighting
+
+;; def-likes
+;; Correctly highlight docstrings
+;(list_lit
+ ;.
+ ;(sym_lit) @_keyword ; Don't really want to highlight twice
+ ;(#any-of? @_keyword
+ ;"def" "defonce" "defrecord" "defmacro" "definline"
+ ;"defmulti" "defmethod" "defstruct" "defprotocol"
+ ;"deftype")
+ ;.
+ ;(sym_lit)
+ ;.
+ ;;; TODO: Add @comment highlight
+ ;(str_lit)?
+ ;.
+ ;(_))
+
+; Function definitions
+(list_lit
+ .
+ (sym_lit) @_keyword.function
+ (#any-of? @_keyword.function "fn" "fn*" "defn" "defn-")
+ .
+ (sym_lit)? @function
+ .
+ ;; TODO: Add @comment highlight
+ (str_lit)?)
+;; TODO: Fix parameter highlighting
+;; I think there's a bug here in nvim-treesitter
+;; TODO: Reproduce bug and file ticket
+ ;.
+ ;[(vec_lit
+ ; (sym_lit)* @parameter)
+ ; (list_lit
+ ; (vec_lit
+ ; (sym_lit)* @parameter))])
+
+;[((list_lit
+; (vec_lit
+; (sym_lit) @parameter)
+; (_)
+; +
+; ((vec_lit
+; (sym_lit) @parameter)
+; (_)))
+
+
+; Meta punctuation
+;; NOTE: When the above `Function definitions` query captures the
+;; the @function it also captures the child meta_lit
+;; We capture the meta_lit symbol (^) after so that the later
+;; highlighting overrides the former
+"^" @punctuation.special
+
+;; namespaces
+(list_lit
+ .
+ (sym_lit) @_include
+ (#eq? @_include "ns")
+ .
+ (sym_lit) @namespace)
diff --git a/queries/clojure/injections.scm b/queries/clojure/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/clojure/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/clojure/locals.scm b/queries/clojure/locals.scm
similarity index 100%
rename from runtime/queries/clojure/locals.scm
rename to queries/clojure/locals.scm
diff --git a/queries/cmake/folds.scm b/queries/cmake/folds.scm
new file mode 100644
index 000000000..9ac59ad4c
--- /dev/null
+++ b/queries/cmake/folds.scm
@@ -0,0 +1,8 @@
+[
+ (if_condition)
+ (foreach_loop)
+ (while_loop)
+ (function_def)
+ (macro_def)
+ (block_def)
+] @fold
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
new file mode 100644
index 000000000..0e846507d
--- /dev/null
+++ b/queries/cmake/highlights.scm
@@ -0,0 +1,242 @@
+[
+ (quoted_argument)
+ (bracket_argument)
+] @string
+
+(variable_ref) @none
+(variable) @variable
+
+[
+ (bracket_comment)
+ (line_comment)
+] @comment @spell
+
+(normal_command (identifier) @function)
+
+["ENV" "CACHE"] @storageclass
+["$" "{" "}" "<" ">"] @punctuation.special
+["(" ")"] @punctuation.bracket
+
+[
+ (function)
+ (endfunction)
+ (macro)
+ (endmacro)
+] @keyword.function
+
+[
+ (if)
+ (elseif)
+ (else)
+ (endif)
+] @conditional
+
+[
+ (foreach)
+ (endforeach)
+ (while)
+ (endwhile)
+] @repeat
+
+(normal_command
+ (identifier) @repeat
+ (#match? @repeat "\\c^(continue|break)$")
+)
+(normal_command
+ (identifier) @keyword.return
+ (#match? @keyword.return "\\c^return$")
+)
+
+(function_command
+ (function)
+ . (argument) @function
+ (argument)* @parameter
+)
+
+(macro_command
+ (macro)
+ . (argument) @function.macro
+ (argument)* @parameter
+)
+
+(block_def
+ (block_command
+ (block) @function.builtin
+ (argument (unquoted_argument) @constant)
+ (#any-of? @constant "SCOPE_FOR" "POLICIES" "VARIABLES" "PROPAGATE")
+ )
+ (endblock_command (endblock) @function.builtin)
+)
+
+((argument) @boolean
+ (#match? @boolean "\\c^(1|on|yes|true|y|0|off|no|false|n|ignore|notfound|.*-notfound)$")
+)
+
+(if_command
+ (if)
+ (argument) @keyword.operator
+ (#any-of? @keyword.operator "NOT" "AND" "OR"
+ "COMMAND" "POLICY" "TARGET" "TEST" "DEFINED" "IN_LIST"
+ "EXISTS" "IS_NEWER_THAN" "IS_DIRECTORY" "IS_SYMLINK" "IS_ABSOLUTE"
+ "MATCHES"
+ "LESS" "GREATER" "EQUAL" "LESS_EQUAL" "GREATER_EQUAL"
+ "STRLESS" "STRGREATER" "STREQUAL" "STRLESS_EQUAL" "STRGREATER_EQUAL"
+ "VERSION_LESS" "VERSION_GREATER" "VERSION_EQUAL" "VERSION_LESS_EQUAL" "VERSION_GREATER_EQUAL"
+ )
+)
+
+(normal_command
+ (identifier) @function.builtin
+ (#match? @function.builtin "\\c^(cmake_host_system_information|cmake_language|cmake_minimum_required|cmake_parse_arguments|cmake_path|cmake_policy|configure_file|execute_process|file|find_file|find_library|find_package|find_path|find_program|foreach|get_cmake_property|get_directory_property|get_filename_component|get_property|include|include_guard|list|macro|mark_as_advanced|math|message|option|separate_arguments|set|set_directory_properties|set_property|site_name|string|unset|variable_watch|add_compile_definitions|add_compile_options|add_custom_command|add_custom_target|add_definitions|add_dependencies|add_executable|add_library|add_link_options|add_subdirectory|add_test|aux_source_directory|build_command|create_test_sourcelist|define_property|enable_language|enable_testing|export|fltk_wrap_ui|get_source_file_property|get_target_property|get_test_property|include_directories|include_external_msproject|include_regular_expression|install|link_directories|link_libraries|load_cache|project|remove_definitions|set_source_files_properties|set_target_properties|set_tests_properties|source_group|target_compile_definitions|target_compile_features|target_compile_options|target_include_directories|target_link_directories|target_link_libraries|target_link_options|target_precompile_headers|target_sources|try_compile|try_run|ctest_build|ctest_configure|ctest_coverage|ctest_empty_binary_directory|ctest_memcheck|ctest_read_custom_files|ctest_run_script|ctest_sleep|ctest_start|ctest_submit|ctest_test|ctest_update|ctest_upload)$")
+)
+
+(normal_command
+ (identifier) @_function
+ . (argument) @variable
+ (#match? @_function "\\c^set$")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^set$")
+ (
+ (argument) @constant
+ (#any-of? @constant "PARENT_SCOPE")
+ ) .
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^set$")
+ . (argument)
+ (
+ (argument) @_cache @storageclass
+ .
+ (argument) @_type @type
+ (#any-of? @_cache "CACHE")
+ (#any-of? @_type "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL")
+ )
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^set$")
+ . (argument)
+ (argument) @_cache
+ (#any-of? @_cache "CACHE")
+ (
+ (argument) @_force @constant
+ (#any-of? @_force "FORCE")
+ ) .
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^unset$")
+ . (argument) @variable
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^unset$")
+ . (argument)
+ (argument) @storageclass
+ (#any-of? @storageclass "CACHE" "PARENT_SCOPE")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^list$")
+ . (argument) @constant
+ (#any-of? @constant "LENGTH" "GET" "JOIN" "SUBLIST" "FIND")
+ . (argument) @variable
+ (argument) @variable .
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^list$")
+ . (argument) @constant
+ . (argument) @variable
+ (#any-of? @constant "APPEND" "FILTER" "INSERT"
+ "POP_BACK" "POP_FRONT" "PREPEND"
+ "REMOVE_ITEM" "REMOVE_AT" "REMOVE_DUPLICATES"
+ "REVERSE" "SORT")
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^list$")
+ . (argument) @_transform @constant
+ . (argument) @variable
+ . (argument) @_action @constant
+ (#match? @_transform "TRANSFORM")
+ (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^list$")
+ . (argument) @_transform @constant
+ . (argument) @variable
+ . (argument) @_action @constant
+ . (argument)? @_selector @constant
+ (#match? @_transform "TRANSFORM")
+ (#any-of? @_action "APPEND" "PREPEND" "TOUPPER" "TOLOWER" "STRIP" "GENEX_STRIP" "REPLACE")
+ (#any-of? @_selector "AT" "FOR" "REGEX")
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^list$")
+ . (argument) @_transform @constant
+ (argument) @constant .
+ (argument) @variable
+ (#match? @_transform "TRANSFORM")
+ (#match? @constant "OUTPUT_VARIABLE")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^add_custom_target$")
+ . (argument)
+ (argument) @constant
+ (#any-of? @constant "ALL" "COMMAND" "DEPENDS" "BYPRODUCTS" "WORKING_DIRECTORY" "COMMENT"
+ "JOB_POOL" "VERBATIM" "USES_TERMINAL" "COMMAND_EXPAND_LISTS" "SOURCES")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^add_custom_command$")
+ (argument) @constant
+ (#any-of? @constant "OUTPUT" "COMMAND" "MAIN_DEPENDENCY" "DEPENDS" "BYPRODUCTS" "IMPLICIT_DEPENDS" "WORKING_DIRECTORY"
+ "COMMENT" "DEPFILE" "JOB_POOL" "VERBATIM" "APPEND" "USES_TERMINAL" "COMMAND_EXPAND_LISTS")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^include$")
+ (argument) @constant
+ (#any-of? @constant "OPTIONAL" "NO_POLICY_SCOPE")
+)
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^include$")
+ (argument) @constant
+ .
+ (argument) @variable
+ (#match? @constant "RESULT_VARIABLE")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^project$")
+ (argument) @constant
+ (#any-of? @constant "VERSION" "DESCRIPTION" "HOMEPAGE_URL" "LANGUAGES")
+)
+
+(normal_command
+ (identifier) @_function
+ (#match? @_function "\\c^cmake_minimum_required$")
+ (argument) @constant
+ (#any-of? @constant "VERSION" "FATAL_ERROR")
+)
+
+(escape_sequence) @string.escape
+
+((source_file . (line_comment) @preproc)
+ (#match? @preproc "^#!/"))
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
new file mode 100644
index 000000000..66bc99cc7
--- /dev/null
+++ b/queries/comment/highlights.scm
@@ -0,0 +1,44 @@
+(_) @spell
+
+[
+ "("
+ ")"
+] @punctuation.bracket
+
+":" @punctuation.delimiter
+
+(tag
+ (name) @text.todo
+ (user)? @constant)
+
+((tag ((name) @text.todo))
+ (#eq? @text.todo "TODO"))
+
+("text" @text.todo
+ (#eq? @text.todo "TODO"))
+
+((tag ((name) @text.note))
+ (#any-of? @text.note "NOTE" "XXX"))
+
+("text" @text.note
+ (#any-of? @text.note "NOTE" "XXX"))
+
+((tag ((name) @text.warning))
+ (#any-of? @text.warning "HACK" "WARNING"))
+
+("text" @text.warning
+ (#any-of? @text.warning "HACK" "WARNING"))
+
+((tag ((name) @text.danger))
+ (#any-of? @text.danger "FIXME" "BUG"))
+
+("text" @text.danger
+ (#any-of? @text.danger "FIXME" "BUG"))
+
+; Issue number (#123)
+("text" @number
+ (#lua-match? @number "^#[0-9]+$"))
+
+; User mention (@user)
+("text" @constant
+ (#lua-match? @constant "^[@][a-zA-Z0-9_-]+$"))
diff --git a/queries/commonlisp/folds.scm b/queries/commonlisp/folds.scm
new file mode 100644
index 000000000..d54daade6
--- /dev/null
+++ b/queries/commonlisp/folds.scm
@@ -0,0 +1 @@
+(source (list_lit) @fold)
diff --git a/queries/commonlisp/highlights.scm b/queries/commonlisp/highlights.scm
new file mode 100644
index 000000000..5cf7c1eb0
--- /dev/null
+++ b/queries/commonlisp/highlights.scm
@@ -0,0 +1,187 @@
+(sym_lit) @variable
+
+;; A highlighting for functions/macros in th cl namespace is available in theHamsta/nvim-treesitter-commonlisp
+;(list_lit . (sym_lit) @function.builtin (#cl-standard-function? @function.builtin))
+;(list_lit . (sym_lit) @function.builtin (#cl-standard-macro? @function.macro))
+
+(dis_expr) @comment
+
+(defun_keyword) @function.macro
+(defun_header
+ function_name: (_) @function)
+(defun_header
+ lambda_list: (list_lit (sym_lit) @parameter))
+(defun_header
+ keyword: (defun_keyword "defmethod")
+ lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @symbol)))
+(defun_header
+ lambda_list: (list_lit (list_lit . (sym_lit) @parameter . (_))))
+(defun_header
+ specifier: (sym_lit) @symbol)
+
+[":" "::" "."] @punctuation.special
+
+[
+ (accumulation_verb)
+ (for_clause_word)
+ "for"
+ "and"
+ "finally"
+ "thereis"
+ "always"
+ "when"
+ "if"
+ "unless"
+ "else"
+ "do"
+ "loop"
+ "below"
+ "in"
+ "from"
+ "across"
+ "repeat"
+ "being"
+ "into"
+ "with"
+ "as"
+ "while"
+ "until"
+ "return"
+ "initially"
+] @function.macro
+"=" @operator
+
+(include_reader_macro) @symbol
+["#C" "#c"] @number
+
+[(kwd_lit) (self_referential_reader_macro)] @symbol
+
+(package_lit
+ package: (_) @namespace)
+"cl" @namespace
+
+(str_lit) @string
+
+(num_lit) @number
+
+((sym_lit) @boolean (#match? @boolean "^(t|T)$"))
+
+(nil_lit) @constant.builtin
+
+(comment) @comment
+
+;; dynamic variables
+((sym_lit) @variable.builtin
+ (#match? @variable.builtin "^[*].+[*]$"))
+
+;; quote
+"'" @string.escape
+(format_specifier) @string.escape
+(quoting_lit) @string.escape
+
+;; syntax quote
+"`" @string.escape
+"," @string.escape
+",@" @string.escape
+(syn_quoting_lit) @string.escape
+(unquoting_lit) @none
+(unquote_splicing_lit) @none
+
+
+["(" ")"] @punctuation.bracket
+
+(block_comment) @comment
+
+
+(with_clause
+ type: (_) @type)
+(for_clause
+ type: (_) @type)
+
+;; defun-like things
+(list_lit
+ .
+ (sym_lit) @function.macro
+ .
+ (sym_lit) @function
+ (#eq? @function.macro "deftest"))
+
+;;; Macros and Special Operators
+(list_lit
+ .
+ (sym_lit) @function.macro
+ ;; For a complete and more efficient version install theHamsta/nvim-treesitter-commonlisp
+ (#any-of? @function.macro
+ "let"
+ "function"
+ "the"
+ "unwind-protect"
+ "labels"
+ "flet"
+ "tagbody"
+ "go"
+ "symbol-macrolet"
+ "symbol-macrolet"
+ "progn"
+ "prog1"
+ "error"
+ "or"
+ "and"
+ "defvar"
+ "defparameter"
+ "in-package"
+ "defpackage"
+ "case"
+ "ecase"
+ "typecase"
+ "etypecase"
+ "defstruct"
+ "defclass"
+ "if"
+ "when"
+ "unless"
+ "cond"
+ "switch"
+ "declaim"
+ "optimize"))
+
+;; constant
+((sym_lit) @constant
+ (#match? @constant "^[+].+[+]$"))
+
+(var_quoting_lit
+ marker: "#'" @symbol
+ value: (_) @symbol)
+
+["#" "#p" "#P"] @symbol
+
+(list_lit
+ .
+ (sym_lit) @function.builtin
+ ;; For a complete and more efficient version install theHamsta/nvim-treesitter-commonlisp
+ (#any-of? @function.builtin
+ "mapcar"
+ "reduce"
+ "remove-if-not"
+ "cons"
+ "car"
+ "last"
+ "nth"
+ "equal"
+ "cdr"
+ "first"
+ "rest"
+ "format"))
+
+(list_lit
+ .
+ (sym_lit) @operator
+ (#match? @operator "^([+*-+=<>]|<=|>=|/=)$"))
+
+
+((sym_lit) @symbol
+(#match? @symbol "^[&]"))
+
+[(array_dimension) "#0A" "#0a"] @number
+
+(char_lit) @character
diff --git a/queries/commonlisp/locals.scm b/queries/commonlisp/locals.scm
new file mode 100644
index 000000000..acdf965b7
--- /dev/null
+++ b/queries/commonlisp/locals.scm
@@ -0,0 +1,72 @@
+
+(defun_header
+ function_name: (sym_lit) @definition.function (#set! definition.function.scope "parent"))
+(defun_header
+ lambda_list: (list_lit (sym_lit) @definition.parameter))
+
+(defun_header
+ keyword: (defun_keyword "defmethod")
+ lambda_list: (list_lit (list_lit . (sym_lit) . (sym_lit) @definition.type)))
+(defun_header
+ lambda_list: (list_lit (list_lit . (sym_lit) @definition.parameter . (_))))
+
+(sym_lit) @reference
+
+(defun) @scope
+
+((list_lit . (sym_lit) @_defvar . (sym_lit) @definition.var)
+(#match? @_defvar "^(cl:)?(defvar|defparameter)$"))
+
+(list_lit
+ .
+ (sym_lit) @_deftest
+ .
+ (sym_lit) @definition.function
+ (#match? @_deftest "^(deftest)$")) @scope
+
+(list_lit
+ .
+ (sym_lit) @_deftest
+ .
+ (sym_lit) @definition.function
+ (#match? @_deftest "^(deftest)$")) @scope
+
+(for_clause . (sym_lit) @definition.var)
+(with_clause . (sym_lit) @definition.var)
+(loop_macro) @scope
+
+(list_lit
+ .
+ (sym_lit) @_let (#match? @_let "(cl:|cffi:)?(with-accessors|with-foreign-objects|let[*]?)")
+ .
+ (list_lit (list_lit . (sym_lit) @definition.var))) @scope
+
+(list_lit
+ .
+ (sym_lit) @_let (#match? @_let "(cl:|alexandria:)?(with-gensyms|dotimes|with-foreign-object)")
+ .
+ (list_lit . (sym_lit) @definition.var)) @scope
+
+(list_lit
+ .
+ (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
+ .
+ (_)
+ (kwd_lit (kwd_symbol) @definition.import))
+
+(list_lit
+ .
+ (kwd_lit) @_import_from (#eq? @_import_from ":import-from")
+ .
+ (_)
+ (sym_lit) @definition.import)
+
+(list_lit
+ .
+ (kwd_lit) @_use (#eq? @_use ":use")
+ (kwd_lit (kwd_symbol) @definition.import))
+
+(list_lit
+ .
+ (kwd_lit) @_use (#eq? @_use ":use")
+ (sym_lit) @definition.import)
diff --git a/queries/cooklang/highlights.scm b/queries/cooklang/highlights.scm
new file mode 100644
index 000000000..4ced465bd
--- /dev/null
+++ b/queries/cooklang/highlights.scm
@@ -0,0 +1,22 @@
+(metadata) @comment
+
+(ingredient
+ "@" @tag
+ (name)? @text.title
+ (amount
+ (quantity)? @number
+ (units)? @tag.attribute)?)
+
+(timer
+ "~" @tag
+ (name)? @text.title
+ (amount
+ (quantity)? @number
+ (units)? @tag.attribute)?)
+
+(cookware
+ "#" @tag
+ (name)? @text.title
+ (amount
+ (quantity)? @number
+ (units)? @tag.attribute)?)
diff --git a/queries/cpp/folds.scm b/queries/cpp/folds.scm
new file mode 100644
index 000000000..23d623b04
--- /dev/null
+++ b/queries/cpp/folds.scm
@@ -0,0 +1,14 @@
+; inherits: c
+
+[
+ (for_range_loop)
+ (class_specifier)
+ (field_declaration
+ type: (enum_specifier)
+ default_value: (initializer_list))
+ (template_declaration)
+ (namespace_definition)
+ (try_statement)
+ (catch_clause)
+ (lambda_expression)
+] @fold
diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
new file mode 100644
index 000000000..1f770e9f8
--- /dev/null
+++ b/queries/cpp/highlights.scm
@@ -0,0 +1,188 @@
+; inherits: c
+
+((identifier) @field
+ (#match? @field "(^_|^m_|_$)"))
+
+(parameter_declaration
+ declarator: (reference_declarator) @parameter)
+
+; function(Foo ...foo)
+(variadic_parameter_declaration
+ declarator: (variadic_declarator
+ (_) @parameter))
+; int foo = 0
+(optional_parameter_declaration
+ declarator: (_) @parameter)
+
+;(field_expression) @parameter ;; How to highlight this?
+(template_function
+ name: (identifier) @function)
+
+(template_method
+ name: (field_identifier) @method)
+
+(((field_expression
+ (field_identifier) @method)) @_parent
+ (#has-parent? @_parent template_method function_declarator call_expression))
+
+(field_declaration
+ (field_identifier) @field)
+
+(field_initializer
+ (field_identifier) @property)
+
+(function_declarator
+ declarator: (field_identifier) @method)
+
+(concept_definition
+ name: (identifier) @type.definition)
+
+(alias_declaration
+ name: (type_identifier) @type.definition)
+
+(auto) @type.builtin
+
+(namespace_identifier) @namespace
+((namespace_identifier) @type
+ (#lua-match? @type "^[A-Z]"))
+((namespace_identifier) @constant
+ (#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
+(case_statement
+ value: (qualified_identifier (identifier) @constant))
+(namespace_definition
+ name: (identifier) @namespace)
+
+(using_declaration . "using" . "namespace" . [(qualified_identifier) (identifier)] @namespace)
+
+(destructor_name
+ (identifier) @method)
+
+(function_declarator
+ declarator: (qualified_identifier
+ name: (identifier) @function))
+(function_declarator
+ declarator: (qualified_identifier
+ name: (qualified_identifier
+ name: (identifier) @function)))
+((function_declarator
+ declarator: (qualified_identifier
+ name: (identifier) @constructor))
+ (#lua-match? @constructor "^[A-Z]"))
+
+(operator_name) @function
+"operator" @function
+"static_assert" @function.builtin
+
+(call_expression
+ function: (qualified_identifier
+ name: (identifier) @function.call))
+(call_expression
+ function: (qualified_identifier
+ name: (qualified_identifier
+ name: (identifier) @function.call)))
+(call_expression
+ function:
+ (qualified_identifier
+ name: (qualified_identifier
+ name: (qualified_identifier
+ name: (identifier) @function.call))))
+
+(call_expression
+ function: (field_expression
+ field: (field_identifier) @function.call))
+
+((call_expression
+ function: (identifier) @constructor)
+(#lua-match? @constructor "^[A-Z]"))
+((call_expression
+ function: (qualified_identifier
+ name: (identifier) @constructor))
+(#lua-match? @constructor "^[A-Z]"))
+
+((call_expression
+ function: (field_expression
+ field: (field_identifier) @constructor))
+(#lua-match? @constructor "^[A-Z]"))
+
+;; constructing a type in an initializer list: Constructor (): **SuperType (1)**
+((field_initializer
+ (field_identifier) @constructor
+ (argument_list))
+ (#lua-match? @constructor "^[A-Z]"))
+
+
+; Constants
+
+(this) @variable.builtin
+(nullptr) @constant
+
+(true) @boolean
+(false) @boolean
+
+; Literals
+
+(raw_string_literal) @string
+
+; Keywords
+
+[
+ "try"
+ "catch"
+ "noexcept"
+ "throw"
+] @exception
+
+
+[
+ "class"
+ "decltype"
+ "explicit"
+ "friend"
+ "namespace"
+ "override"
+ "template"
+ "typename"
+ "using"
+ "co_await"
+ "concept"
+ "requires"
+] @keyword
+
+[
+ "public"
+ "private"
+ "protected"
+ "virtual"
+ "final"
+] @type.qualifier
+
+[
+ "co_yield"
+ "co_return"
+] @keyword.return
+
+[
+ "new"
+ "delete"
+
+ "xor"
+ "bitand"
+ "bitor"
+ "compl"
+ "not"
+ "xor_eq"
+ "and_eq"
+ "or_eq"
+ "not_eq"
+ "and"
+ "or"
+] @keyword.operator
+
+"<=>" @operator
+
+"::" @punctuation.delimiter
+
+(template_argument_list
+ ["<" ">"] @punctuation.bracket)
+
+(literal_suffix) @operator
diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
new file mode 100644
index 000000000..f1007dd28
--- /dev/null
+++ b/queries/cpp/indents.scm
@@ -0,0 +1,10 @@
+; inherits: c
+
+[
+ (class_specifier)
+ (condition_clause)
+] @indent
+
+((field_initializer_list) @indent
+ (#set! "start_at_same_line" 1))
+(access_specifier) @branch
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
new file mode 100644
index 000000000..13842120d
--- /dev/null
+++ b/queries/cpp/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @cpp
+
+(comment) @comment
diff --git a/queries/cpp/locals.scm b/queries/cpp/locals.scm
new file mode 100644
index 000000000..c48a7cc39
--- /dev/null
+++ b/queries/cpp/locals.scm
@@ -0,0 +1,71 @@
+; inherits: c
+
+;; Parameters
+(variadic_parameter_declaration
+ declarator: (variadic_declarator
+ (identifier) @definition.parameter))
+(optional_parameter_declaration
+ declarator: (identifier) @definition.parameter)
+;; Class / struct definitions
+(class_specifier) @scope
+
+(reference_declarator
+ (identifier) @definition.var)
+
+(variadic_declarator
+ (identifier) @definition.var)
+
+(struct_specifier
+ name: (qualified_identifier
+ name: (type_identifier) @definition.type))
+
+(class_specifier
+ name: (type_identifier) @definition.type)
+
+(concept_definition
+ name: (identifier) @definition.type)
+
+(class_specifier
+ name: (qualified_identifier
+ name: (type_identifier) @definition.type))
+
+(alias_declaration
+ name: (type_identifier) @definition.type)
+
+;template
+(type_parameter_declaration
+ (type_identifier) @definition.type)
+(template_declaration) @scope
+
+;; Namespaces
+(namespace_definition
+ name: (identifier) @definition.namespace
+ body: (_) @scope)
+
+((namespace_identifier) @reference
+ (set! reference.kind "namespace"))
+
+;; Function definitions
+(template_function
+ name: (identifier) @definition.function) @scope
+
+(template_method
+ name: (field_identifier) @definition.method) @scope
+
+(function_declarator
+ declarator: (qualified_identifier
+ name: (identifier) @definition.function)) @scope
+
+(field_declaration
+ declarator: (function_declarator
+ (field_identifier) @definition.method))
+
+(lambda_expression) @scope
+
+;; Control structures
+(try_statement
+ body: (_) @scope)
+
+(catch_clause) @scope
+
+(requires_expression) @scope
diff --git a/queries/css/folds.scm b/queries/css/folds.scm
new file mode 100644
index 000000000..9d2995c48
--- /dev/null
+++ b/queries/css/folds.scm
@@ -0,0 +1,3 @@
+[
+ (rule_set)
+] @fold
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
new file mode 100644
index 000000000..bacc5bd26
--- /dev/null
+++ b/queries/css/highlights.scm
@@ -0,0 +1,91 @@
+[
+ "@media"
+ "@charset"
+ "@namespace"
+ "@supports"
+ "@keyframes"
+ (at_keyword)
+ (to)
+ (from)
+ ] @keyword
+
+"@import" @include
+
+(comment) @comment @spell
+
+[
+ (tag_name)
+ (nesting_selector)
+ (universal_selector)
+ ] @type
+
+(function_name) @function
+
+[
+ "~"
+ ">"
+ "+"
+ "-"
+ "*"
+ "/"
+ "="
+ "^="
+ "|="
+ "~="
+ "$="
+ "*="
+ "and"
+ "or"
+ "not"
+ "only"
+ ] @operator
+
+(important) @type.qualifier
+
+(attribute_selector (plain_value) @string)
+(pseudo_element_selector "::" (tag_name) @property)
+(pseudo_class_selector (class_name) @property)
+
+[
+ (class_name)
+ (id_name)
+ (property_name)
+ (feature_name)
+ (attribute_name)
+ ] @property
+
+(namespace_name) @namespace
+
+((property_name) @type.definition
+ (#match? @type.definition "^--"))
+((plain_value) @type
+ (#match? @type "^--"))
+
+[
+ (string_value)
+ (color_value)
+ (unit)
+ ] @string
+
+[
+ (integer_value)
+ (float_value)
+ ] @number
+
+[
+ "#"
+ ","
+ "."
+ ":"
+ "::"
+ ";"
+ ] @punctuation.delimiter
+
+[
+ "{"
+ ")"
+ "("
+ "}"
+ ] @punctuation.bracket
+
+(ERROR) @error
diff --git a/queries/css/indents.scm b/queries/css/indents.scm
new file mode 100644
index 000000000..1ea8a336f
--- /dev/null
+++ b/queries/css/indents.scm
@@ -0,0 +1,9 @@
+[
+ (block)
+ (declaration)
+] @indent
+
+(block ("}") @branch)
+("}") @dedent
+
+(comment) @ignore
diff --git a/queries/css/injections.scm b/queries/css/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/css/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/cuda/folds.scm b/queries/cuda/folds.scm
similarity index 100%
rename from runtime/queries/cuda/folds.scm
rename to queries/cuda/folds.scm
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
new file mode 100644
index 000000000..20a753be3
--- /dev/null
+++ b/queries/cuda/highlights.scm
@@ -0,0 +1,11 @@
+; inherits: cpp
+
+[ "<<<" ">>>" ] @punctuation.bracket
+
+[
+ "__host__"
+ "__device__"
+ "__forceinline__"
+] @storageclass
+
+"__launch_bounds__" @type.qualifier
diff --git a/runtime/queries/cuda/indents.scm b/queries/cuda/indents.scm
similarity index 100%
rename from runtime/queries/cuda/indents.scm
rename to queries/cuda/indents.scm
diff --git a/queries/cuda/injections.scm b/queries/cuda/injections.scm
new file mode 100644
index 000000000..49fe7c532
--- /dev/null
+++ b/queries/cuda/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @cuda
+
+(comment) @comment
diff --git a/runtime/queries/cuda/locals.scm b/queries/cuda/locals.scm
similarity index 100%
rename from runtime/queries/cuda/locals.scm
rename to queries/cuda/locals.scm
diff --git a/queries/d/folds.scm b/queries/d/folds.scm
new file mode 100644
index 000000000..be4dee45e
--- /dev/null
+++ b/queries/d/folds.scm
@@ -0,0 +1 @@
+(block_statement) @fold
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
new file mode 100644
index 000000000..8bec1ca10
--- /dev/null
+++ b/queries/d/highlights.scm
@@ -0,0 +1,277 @@
+;; Misc
+
+[
+ (line_comment)
+ (block_comment)
+ (nesting_block_comment)
+] @comment
+
+[
+ "(" ")"
+ "[" "]"
+ "{" "}"
+] @punctuation.bracket
+
+[
+ ","
+ ";"
+ "."
+ ":"
+] @punctuation.delimiter
+
+[
+ ".."
+ "$"
+] @punctuation.special
+
+;; Constants
+
+[
+ "__FILE_FULL_PATH__"
+ "__FILE__"
+ "__FUNCTION__"
+ "__LINE__"
+ "__MODULE__"
+ "__PRETTY_FUNCTION__"
+] @constant.macro
+
+[
+ (wysiwyg_string)
+ (alternate_wysiwyg_string)
+ (double_quoted_string)
+ (hex_string)
+ (delimited_string)
+ (token_string)
+] @string
+
+(character_literal) @character
+
+(integer_literal) @number
+
+(float_literal) @float
+
+[
+ "true"
+ "false"
+] @boolean
+
+;; Functions
+
+(func_declarator
+ (identifier) @function
+)
+
+[
+ "__traits"
+ "__vector"
+ "assert"
+ "is"
+ "mixin"
+ "pragma"
+ "typeid"
+] @function.builtin
+
+(import_expression
+ "import" @function.builtin
+)
+
+(parameter
+ (var_declarator
+ (identifier) @parameter
+ )
+)
+
+(function_literal
+ (identifier) @parameter
+)
+
+(constructor
+ "this" @constructor
+)
+
+(destructor
+ "this" @constructor
+)
+
+;; Keywords
+
+[
+ "case"
+ "default"
+ "else"
+ "if"
+ "switch"
+] @conditional
+
+[
+ "break"
+ "continue"
+ "do"
+ "for"
+ "foreach"
+ "foreach_reverse"
+ "while"
+] @repeat
+
+[
+ "__parameters"
+ "alias"
+ "align"
+ "asm"
+ "auto"
+ "body"
+ "class"
+ "debug"
+ "enum"
+ "export"
+ "goto"
+ "interface"
+ "invariant"
+ "macro"
+ "out"
+ "override"
+ "package"
+ "static"
+ "struct"
+ "template"
+ "union"
+ "unittest"
+ "version"
+ "with"
+] @keyword
+
+[
+ "delegate"
+ "function"
+] @keyword.function
+
+"return" @keyword.return
+
+[
+ "cast"
+ "new"
+] @keyword.operator
+
+[
+ "+"
+ "++"
+ "+="
+ "-"
+ "--"
+ "-="
+ "*"
+ "*="
+ "%"
+ "%="
+ "^"
+ "^="
+ "^^"
+ "^^="
+ "/"
+ "/="
+ "|"
+ "|="
+ "||"
+ "~"
+ "~="
+ "="
+ "=="
+ "=>"
+ "<"
+ "<="
+ "<<"
+ "<<="
+ ">"
+ ">="
+ ">>"
+ ">>="
+ ">>>"
+ ">>>="
+ "!"
+ "!="
+ "&"
+ "&&"
+] @operator
+
+[
+ "catch"
+ "finally"
+ "throw"
+ "try"
+] @exception
+
+"null" @constant.builtin
+
+[
+ "__gshared"
+ "const"
+ "immutable"
+ "shared"
+] @storageclass
+
+[
+ "abstract"
+ "deprecated"
+ "extern"
+ "final"
+ "inout"
+ "lazy"
+ "nothrow"
+ "private"
+ "protected"
+ "public"
+ "pure"
+ "ref"
+ "scope"
+ "synchronized"
+] @type.qualifier
+
+(alias_assignment
+ . (identifier) @type.definition)
+
+(module_declaration
+ "module" @include
+)
+
+(import_declaration
+ "import" @include
+)
+
+(type) @type
+
+(catch_parameter
+ (qualified_identifier) @type
+)
+
+(var_declarations
+ (qualified_identifier) @type
+)
+
+(func_declaration
+ (qualified_identifier) @type
+)
+
+(parameter
+ (qualified_identifier) @type
+)
+
+(class_declaration
+ (identifier) @type
+)
+
+(fundamental_type) @type.builtin
+
+(module_fully_qualified_name (packages (package_name) @namespace))
+(module_name) @namespace
+
+(at_attribute) @attribute
+
+(user_defined_attribute
+ "@" @attribute
+)
+
+;; Variables
+
+(primary_expression
+ "this" @variable.builtin
+)
diff --git a/queries/d/indents.scm b/queries/d/indents.scm
new file mode 100644
index 000000000..7a6df759c
--- /dev/null
+++ b/queries/d/indents.scm
@@ -0,0 +1,17 @@
+[
+ (block_statement)
+ (case_statement)
+ (token_string)
+] @indent
+
+[
+ "(" ")"
+ "{" "}"
+ "[" "]"
+] @branch
+
+[
+ (line_comment)
+ (block_comment)
+ (nesting_block_comment)
+] @ignore
diff --git a/queries/d/injections.scm b/queries/d/injections.scm
new file mode 100644
index 000000000..d95514370
--- /dev/null
+++ b/queries/d/injections.scm
@@ -0,0 +1,7 @@
+[
+ (line_comment)
+ (block_comment)
+ (nesting_block_comment)
+] @comment
+
+(token_string_tokens) @d
diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm
new file mode 100644
index 000000000..19991c66f
--- /dev/null
+++ b/queries/dart/highlights.scm
@@ -0,0 +1,269 @@
+(dotted_identifier_list) @string
+
+; Methods
+; --------------------
+(super) @function
+
+; TODO: add method/call_expression to grammar and
+; distinguish method call from variable access
+(function_expression_body (identifier) @function)
+; ((identifier)(selector (argument_part)) @function)
+
+; NOTE: This query is a bit of a work around for the fact that the dart grammar doesn't
+; specifically identify a node as a function call
+(((identifier) @function (#match? @function "^_?[a-z]"))
+ . (selector . (argument_part))) @function
+
+; Annotations
+; --------------------
+(annotation
+ name: (identifier) @attribute)
+(marker_annotation
+ name: (identifier) @attribute)
+
+; Operators and Tokens
+; --------------------
+(template_substitution
+ "$" @punctuation.special
+ "{" @punctuation.special
+ "}" @punctuation.special
+) @none
+
+(template_substitution
+ "$" @punctuation.special
+ (identifier_dollar_escaped) @variable
+) @none
+
+(escape_sequence) @string.escape
+
+[
+ "@"
+ "=>"
+ ".."
+ "??"
+ "=="
+ "?"
+ ":"
+ "&&"
+ "%"
+ "<"
+ ">"
+ "="
+ ">="
+ "<="
+ "||"
+ (multiplicative_operator)
+ (increment_operator)
+ (is_operator)
+ (prefix_operator)
+ (equality_operator)
+ (additive_operator)
+] @operator
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+; Delimiters
+; --------------------
+[
+ ";"
+ "."
+ ","
+] @punctuation.delimiter
+
+; Types
+; --------------------
+(class_definition
+ name: (identifier) @type)
+(constructor_signature
+ name: (identifier) @type)
+(scoped_identifier
+ scope: (identifier) @type)
+(function_signature
+ name: (identifier) @method)
+(getter_signature
+ (identifier) @method)
+(setter_signature
+ name: (identifier) @method)
+(enum_declaration
+ name: (identifier) @type)
+(enum_constant
+ name: (identifier) @type)
+(void_type) @type
+
+((scoped_identifier
+ scope: (identifier) @type
+ name: (identifier) @type)
+ (#match? @type "^[a-zA-Z]"))
+
+(type_identifier) @type
+
+(type_alias
+ (type_identifier) @type.definition)
+
+; Variables
+; --------------------
+; var keyword
+(inferred_type) @keyword
+
+((identifier) @type
+ (#match? @type "^_?[A-Z].*[a-z]")) ; catch Classes or IClasses not CLASSES
+
+("Function" @type)
+
+; properties
+(unconditional_assignable_selector
+ (identifier) @property)
+
+(conditional_assignable_selector
+ (identifier) @property)
+
+; assignments
+(assignment_expression
+ left: (assignable_expression) @variable)
+
+(this) @variable.builtin
+
+; Parameters
+; --------------------
+(formal_parameter
+ name: (identifier) @parameter)
+
+(named_argument
+ (label (identifier) @parameter))
+
+; Literals
+; --------------------
+[
+ (hex_integer_literal)
+ (decimal_integer_literal)
+ (decimal_floating_point_literal)
+ ; TODO: inaccessbile nodes
+ ; (octal_integer_literal)
+ ; (hex_floating_point_literal)
+] @number
+
+(symbol_literal) @symbol
+(string_literal) @string
+(true) @boolean
+(false) @boolean
+(null_literal) @constant.builtin
+
+(documentation_comment) @comment
+(comment) @comment
+
+; Keywords
+; --------------------
+[
+ "import"
+ "library"
+ "export"
+ "as"
+ "show"
+ "hide"
+] @include
+
+; Reserved words (cannot be used as identifiers)
+[
+ ; TODO:
+ ; "rethrow" cannot be targeted at all and seems to be an invisible node
+ ; TODO:
+ ; the assert keyword cannot be specifically targeted
+ ; because the grammar selects the whole node or the content
+ ; of the assertion not just the keyword
+ ; assert
+ (case_builtin)
+ "late"
+ "required"
+ "extension"
+ "on"
+ "class"
+ "enum"
+ "extends"
+ "in"
+ "is"
+ "new"
+ "super"
+ "with"
+] @keyword
+
+[
+ "return"
+ "yield"
+] @keyword.return
+
+
+; Built in identifiers:
+; alone these are marked as keywords
+[
+ "await"
+ "deferred"
+ "factory"
+ "get"
+ "implements"
+ "interface"
+ "library"
+ "operator"
+ "mixin"
+ "part"
+ "set"
+ "typedef"
+] @keyword
+
+[
+ (const_builtin)
+ (final_builtin)
+ "abstract"
+ "async"
+ "async*"
+ "covariant"
+ "dynamic"
+ "external"
+ "static"
+ "sync*"
+] @type.qualifier
+
+; when used as an identifier:
+((identifier) @variable.builtin
+ (#any-of? @variable.builtin
+ "abstract"
+ "as"
+ "covariant"
+ "deferred"
+ "dynamic"
+ "export"
+ "external"
+ "factory"
+ "Function"
+ "get"
+ "implements"
+ "import"
+ "interface"
+ "library"
+ "operator"
+ "mixin"
+ "part"
+ "set"
+ "static"
+ "typedef"))
+
+["if" "else" "switch" "default"] @conditional
+
+[
+ "try"
+ "throw"
+ "catch"
+ "finally"
+ (break_statement)
+] @exception
+
+["do" "while" "continue" "for"] @repeat
+
+; Error
+(ERROR) @error
diff --git a/queries/dart/indents.scm b/queries/dart/indents.scm
new file mode 100644
index 000000000..e01cc238d
--- /dev/null
+++ b/queries/dart/indents.scm
@@ -0,0 +1,27 @@
+[
+ (class_body)
+ (function_body)
+ (function_expression_body)
+ (declaration (initializers))
+ (switch_block)
+ (if_statement)
+ (formal_parameter_list)
+ (formal_parameter)
+ (list_literal)
+ (return_statement)
+ (arguments)
+] @indent
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @branch
+
+; this one is for dedenting the else block
+(if_statement (block) @branch)
+
+(comment) @ignore
diff --git a/queries/dart/injections.scm b/queries/dart/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/dart/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/dart/locals.scm b/queries/dart/locals.scm
new file mode 100644
index 000000000..1013d4a92
--- /dev/null
+++ b/queries/dart/locals.scm
@@ -0,0 +1,8 @@
+(class_definition
+ body: (_) @scope)
+
+ (block) @scope
+
+ (try_statement) @scope
+ (catch_clause) @scope
+ (finally_clause) @scope
diff --git a/runtime/queries/devicetree/folds.scm b/queries/devicetree/folds.scm
similarity index 100%
rename from runtime/queries/devicetree/folds.scm
rename to queries/devicetree/folds.scm
diff --git a/runtime/queries/devicetree/highlights.scm b/queries/devicetree/highlights.scm
similarity index 53%
rename from runtime/queries/devicetree/highlights.scm
rename to queries/devicetree/highlights.scm
index 74ec89af1..e3140a5da 100644
--- a/runtime/queries/devicetree/highlights.scm
+++ b/queries/devicetree/highlights.scm
@@ -1,12 +1,11 @@
-(comment) @comment @spell
+(comment) @comment
[
(preproc_include)
(dtsi_include)
-] @keyword.import
+] @include
(preproc_def) @constant.macro
-
(preproc_function_def) @function.macro
[
@@ -23,39 +22,14 @@
(integer_literal) @number
(identifier) @variable
-
-(node
- (identifier) @module)
-
-(property
- (identifier) @property)
-
-(node
- label: (_) @label)
-
-(call_expression
- (identifier) @function.macro)
+(node (identifier) @namespace)
+(property (identifier) @property)
+(labeled_item (identifier) @label)
+(call_expression (identifier) @function.macro)
(reference) @label ; referencing labeled_item.identifier
-
(unit_address) @constant
-"=" @operator
-
-[
- "("
- ")"
- "["
- "]"
- "{"
- "}"
- "<"
- ">"
-] @punctuation.bracket
-
-[
- ";"
- ":"
- ","
- "@"
-] @punctuation.delimiter
+[ "=" ] @operator
+[ "(" ")" "[" "]" "{" "}" "<" ">" ] @punctuation.bracket
+[ ";" ":" "," "@" ] @punctuation.delimiter
diff --git a/runtime/queries/devicetree/indents.scm b/queries/devicetree/indents.scm
similarity index 50%
rename from runtime/queries/devicetree/indents.scm
rename to queries/devicetree/indents.scm
index 9740060ca..cd7c8fcd6 100644
--- a/runtime/queries/devicetree/indents.scm
+++ b/queries/devicetree/indents.scm
@@ -2,11 +2,13 @@
(node)
(property)
(integer_cells)
-] @indent.begin
+] @indent
[
"}"
">"
-] @indent.branch
+] @branch
-(comment) @indent.ignore
+[
+ (comment)
+] @ignore
diff --git a/queries/devicetree/injections.scm b/queries/devicetree/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/devicetree/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/devicetree/locals.scm b/queries/devicetree/locals.scm
similarity index 65%
rename from runtime/queries/devicetree/locals.scm
rename to queries/devicetree/locals.scm
index e33a81dfd..95b124bd1 100644
--- a/runtime/queries/devicetree/locals.scm
+++ b/queries/devicetree/locals.scm
@@ -1,4 +1,4 @@
[
(node)
(integer_cells)
-] @local.scope
+]@scope
diff --git a/queries/diff/highlights.scm b/queries/diff/highlights.scm
new file mode 100644
index 000000000..4b9cbad60
--- /dev/null
+++ b/queries/diff/highlights.scm
@@ -0,0 +1,6 @@
+[(addition) (new_file)] @text.diff.add
+[(deletion) (old_file)] @text.diff.delete
+
+(commit) @constant
+(location) @attribute
+(command) @function
diff --git a/runtime/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
similarity index 67%
rename from runtime/queries/dockerfile/highlights.scm
rename to queries/dockerfile/highlights.scm
index 72893f8b0..2d1840e66 100644
--- a/runtime/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -36,33 +36,28 @@
(double_quoted_string) @string
-[
- (heredoc_marker)
- (heredoc_end)
-] @label
-
-((heredoc_block
- (heredoc_line) @string)
- (#set! priority 90))
-
(expansion
[
"$"
"{"
"}"
- ] @punctuation.special)
+ ] @punctuation.special
+)
((variable) @constant
(#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
(arg_instruction
- .
- (unquoted_string) @property)
+ . (unquoted_string) @property)
(env_instruction
- (env_pair
- .
- (unquoted_string) @property))
+ (env_pair . (unquoted_string) @property))
(expose_instruction
(expose_port) @number)
+
+((stopsignal_instruction) @number
+ (#match? @number "[0-9][0-9]?$"))
+
+((stopsignal_instruction) @constant.builtin
+ (#match? @constant.builtin "SIG(ABRT|HUP|INT|KILL|QUIT|STOP|TERM|TSTP)$"))
diff --git a/queries/dockerfile/injections.scm b/queries/dockerfile/injections.scm
new file mode 100644
index 000000000..c1fdd3f99
--- /dev/null
+++ b/queries/dockerfile/injections.scm
@@ -0,0 +1,3 @@
+(comment) @comment
+
+(shell_command) @bash
diff --git a/runtime/queries/dot/highlights.scm b/queries/dot/highlights.scm
similarity index 69%
rename from runtime/queries/dot/highlights.scm
rename to queries/dot/highlights.scm
index 75ad92271..d8b70a949 100644
--- a/runtime/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -10,7 +10,6 @@
] @keyword
(string_literal) @string
-
(number_literal) @number
[
@@ -34,16 +33,23 @@
(subgraph
id: (id
- (identifier) @module))
+ (identifier) @namespace)
+)
(attribute
name: (id
- (identifier) @variable.member))
+ (identifier) @field)
+)
(attribute
value: (id
- (identifier) @constant))
+ (identifier) @constant)
+)
-(comment) @comment @spell
+(comment) @comment
-(preproc) @keyword.directive
+(preproc) @preproc
+
+(comment) @spell
+
+(ERROR) @error
diff --git a/queries/dot/injections.scm b/queries/dot/injections.scm
new file mode 100644
index 000000000..529d04d4a
--- /dev/null
+++ b/queries/dot/injections.scm
@@ -0,0 +1,2 @@
+(html_internal) @html
+(comment) @comment
diff --git a/queries/ebnf/highlights.scm b/queries/ebnf/highlights.scm
new file mode 100644
index 000000000..416aaab68
--- /dev/null
+++ b/queries/ebnf/highlights.scm
@@ -0,0 +1,43 @@
+;;;; Simple tokens ;;;;
+(terminal) @string.grammar
+
+(special_sequence) @string.special.grammar
+
+(integer) @number
+
+(comment) @comment
+
+;;;; Identifiers ;;;;
+
+; Allow different highlighting for specific casings
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+
+((identifier) @symbol
+ (#match? @symbol "^[a-z]"))
+
+((identifier) @constant
+ (#match? @constant "^[A-Z][A-Z0-9_]+$"))
+
+;;; Punctuation ;;;;
+[
+ ";"
+ ","
+] @punctuation.delimiter
+
+[
+ "|"
+ "*"
+ "-"
+] @operator
+
+"=" @keyword.operator
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
diff --git a/runtime/queries/ecma/folds.scm b/queries/ecma/folds.scm
similarity index 84%
rename from runtime/queries/ecma/folds.scm
rename to queries/ecma/folds.scm
index a348f3444..50f235a5d 100644
--- a/runtime/queries/ecma/folds.scm
+++ b/queries/ecma/folds.scm
@@ -1,10 +1,9 @@
[
- (arguments)
(for_in_statement)
(for_statement)
(while_statement)
(arrow_function)
- (function_expression)
+ (function)
(function_declaration)
(class_declaration)
(method_definition)
@@ -13,11 +12,10 @@
(switch_statement)
(switch_case)
(switch_default)
- (import_statement)+
+ (import_statement)
(if_statement)
(try_statement)
(catch_clause)
- (array)
(object)
(generator_function)
(generator_function_declaration)
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
new file mode 100644
index 000000000..1de0de302
--- /dev/null
+++ b/queries/ecma/highlights.scm
@@ -0,0 +1,276 @@
+; Types
+
+; Javascript
+
+; Variables
+;-----------
+(identifier) @variable
+
+; Properties
+;-----------
+
+(property_identifier) @property
+(shorthand_property_identifier) @property
+(private_property_identifier) @property
+
+(variable_declarator
+ name: (object_pattern
+ (shorthand_property_identifier_pattern))) @variable
+
+; Special identifiers
+;--------------------
+
+((identifier) @constructor
+ (#lua-match? @constructor "^[A-Z]"))
+
+((identifier) @constant
+ (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+
+((shorthand_property_identifier) @constant
+ (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+
+((identifier) @variable.builtin
+ (#vim-match? @variable.builtin "^(arguments|module|console|window|document)$"))
+
+((identifier) @function.builtin
+ (#eq? @function.builtin "require"))
+
+; Function and method definitions
+;--------------------------------
+
+(function
+ name: (identifier) @function)
+(function_declaration
+ name: (identifier) @function)
+(generator_function
+ name: (identifier) @function)
+(generator_function_declaration
+ name: (identifier) @function)
+(method_definition
+ name: [(property_identifier) (private_property_identifier)] @method)
+
+(pair
+ key: (property_identifier) @method
+ value: (function))
+(pair
+ key: (property_identifier) @method
+ value: (arrow_function))
+
+(assignment_expression
+ left: (member_expression
+ property: (property_identifier) @method)
+ right: (arrow_function))
+(assignment_expression
+ left: (member_expression
+ property: (property_identifier) @method)
+ right: (function))
+
+(variable_declarator
+ name: (identifier) @function
+ value: (arrow_function))
+(variable_declarator
+ name: (identifier) @function
+ value: (function))
+
+(assignment_expression
+ left: (identifier) @function
+ right: (arrow_function))
+(assignment_expression
+ left: (identifier) @function
+ right: (function))
+
+; Function and method calls
+;--------------------------
+
+(call_expression
+ function: (identifier) @function.call)
+
+(call_expression
+ function: (member_expression
+ property: [(property_identifier) (private_property_identifier)] @method.call))
+
+; Variables
+;----------
+(namespace_import
+ (identifier) @namespace)
+
+; Literals
+;---------
+
+[
+ (this)
+ (super)
+] @variable.builtin
+
+[
+ (true)
+ (false)
+] @boolean
+
+[
+ (null)
+ (undefined)
+] @constant.builtin
+
+(comment) @comment
+
+(hash_bang_line) @preproc
+
+(comment) @spell
+
+(string) @string @spell
+(template_string) @string
+(escape_sequence) @string.escape
+(regex_pattern) @string.regex
+(regex "/" @punctuation.bracket) ; Regex delimiters
+
+(number) @number
+((identifier) @number
+ (#any-of? @number "NaN" "Infinity"))
+
+; Punctuation
+;------------
+
+"..." @punctuation.special
+
+";" @punctuation.delimiter
+"." @punctuation.delimiter
+"," @punctuation.delimiter
+
+(pair ":" @punctuation.delimiter)
+(pair_pattern ":" @punctuation.delimiter)
+
+[
+ "--"
+ "-"
+ "-="
+ "&&"
+ "+"
+ "++"
+ "+="
+ "&="
+ "/="
+ "**="
+ "<<="
+ "<"
+ "<="
+ "<<"
+ "="
+ "=="
+ "==="
+ "!="
+ "!=="
+ "=>"
+ ">"
+ ">="
+ ">>"
+ "||"
+ "%"
+ "%="
+ "*"
+ "**"
+ ">>>"
+ "&"
+ "|"
+ "^"
+ "??"
+ "*="
+ ">>="
+ ">>>="
+ "^="
+ "|="
+ "&&="
+ "||="
+ "??="
+] @operator
+
+(binary_expression "/" @operator)
+(ternary_expression ["?" ":"] @conditional.ternary)
+(unary_expression ["!" "~" "-" "+"] @operator)
+(unary_expression ["delete" "void" "typeof"] @keyword.operator)
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+((template_substitution ["${" "}"] @punctuation.special) @none)
+
+; Keywords
+;----------
+
+[
+"if"
+"else"
+"switch"
+"case"
+] @conditional
+
+[
+"import"
+"from"
+] @include
+
+(export_specifier "as" @include)
+(import_specifier "as" @include)
+(namespace_export "as" @include)
+(namespace_import "as" @include)
+
+[
+"for"
+"of"
+"do"
+"while"
+"continue"
+] @repeat
+
+[
+"async"
+"await"
+"break"
+"class"
+"const"
+"debugger"
+"export"
+"extends"
+"get"
+"in"
+"instanceof"
+"let"
+"set"
+"static"
+"target"
+"typeof"
+"var"
+"with"
+] @keyword
+
+[
+"return"
+"yield"
+] @keyword.return
+
+[
+ "function"
+] @keyword.function
+
+[
+ "new"
+ "delete"
+] @keyword.operator
+
+[
+ "throw"
+ "try"
+ "catch"
+ "finally"
+] @exception
+
+(export_statement
+ "default" @keyword)
+(switch_default
+ "default" @conditional)
diff --git a/queries/ecma/indents.scm b/queries/ecma/indents.scm
new file mode 100644
index 000000000..0f99e0469
--- /dev/null
+++ b/queries/ecma/indents.scm
@@ -0,0 +1,56 @@
+[
+ (arguments)
+ (array)
+ (binary_expression)
+ (class_body)
+ (export_clause)
+ (formal_parameters)
+ (named_imports)
+ (object)
+ (object_pattern)
+ (parenthesized_expression)
+ (return_statement)
+ (statement_block)
+ (switch_case)
+ (switch_default)
+ (switch_statement)
+ (template_substitution)
+ (ternary_expression)
+] @indent
+
+(arguments (call_expression) @indent)
+(binary_expression (call_expression) @indent)
+(expression_statement (call_expression) @indent)
+(arrow_function
+ body: (_) @_body
+ (#not-has-type? @_body statement_block)
+) @indent
+(assignment_expression
+ right: (_) @_right
+ (#not-has-type? @_right arrow_function function)
+) @indent
+(variable_declarator
+ value: (_) @_value
+ (#not-has-type? @_value arrow_function call_expression function)
+) @indent
+
+(arguments ")" @indent_end)
+(object "}" @indent_end)
+(statement_block "}" @indent_end)
+
+[
+ (arguments (object))
+ ")"
+ "}"
+ "]"
+] @branch
+(statement_block "{" @branch)
+
+["}" "]"] @indent_end
+
+[
+ (comment)
+ (template_string)
+] @ignore
+
+(ERROR) @auto
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
new file mode 100644
index 000000000..6bd5da862
--- /dev/null
+++ b/queries/ecma/injections.scm
@@ -0,0 +1,69 @@
+(((comment) @_jsdoc_comment
+ (#match? @_jsdoc_comment "^/\\*\\*[^\\*].*\\*/")) @jsdoc)
+
+(comment) @comment
+
+(call_expression
+ function: ((identifier) @language)
+ arguments: ((template_string) @content
+ (#offset! @content 0 1 0 -1)))
+
+(call_expression
+ function: ((identifier) @_name
+ (#eq? @_name "gql"))
+ arguments: ((template_string) @graphql
+ (#offset! @graphql 0 1 0 -1)))
+
+(call_expression
+ function: ((identifier) @_name
+ (#eq? @_name "hbs"))
+ arguments: ((template_string) @glimmer
+ (#offset! @glimmer 0 1 0 -1)))
+
+((glimmer_template) @glimmer)
+
+; styled.div``
+(call_expression
+ function: (member_expression
+ object: (identifier) @_name
+ (#eq? @_name "styled"))
+ arguments: ((template_string) @css
+ (#offset! @css 0 1 0 -1)))
+
+; styled(Component)``
+(call_expression
+ function: (call_expression
+ function: (identifier) @_name
+ (#eq? @_name "styled"))
+ arguments: ((template_string) @css
+ (#offset! @css 0 1 0 -1)))
+
+; styled.div.attrs({ prop: "foo" })``
+(call_expression
+ function: (call_expression
+ function: (member_expression
+ object: (member_expression
+ object: (identifier) @_name
+ (#eq? @_name "styled"))))
+ arguments: ((template_string) @css
+ (#offset! @css 0 1 0 -1)))
+
+
+; styled(Component).attrs({ prop: "foo" })``
+(call_expression
+ function: (call_expression
+ function: (member_expression
+ object: (call_expression
+ function: (identifier) @_name
+ (#eq? @_name "styled"))))
+ arguments: ((template_string) @css
+ (#offset! @css 0 1 0 -1)))
+
+(regex_pattern) @regex
+
+((comment) @_gql_comment
+ (#eq? @_gql_comment "/* GraphQL */")
+ (template_string) @graphql)
+
+(((template_string) @_template_string
+ (#match? @_template_string "^`#graphql")) @graphql)
diff --git a/queries/ecma/locals.scm b/queries/ecma/locals.scm
new file mode 100644
index 000000000..4c035d269
--- /dev/null
+++ b/queries/ecma/locals.scm
@@ -0,0 +1,37 @@
+; Scopes
+;-------
+
+(statement_block) @scope
+(function) @scope
+(arrow_function) @scope
+(function_declaration) @scope
+(method_definition) @scope
+(for_statement) @scope
+(for_in_statement) @scope
+(catch_clause) @scope
+
+; Definitions
+;------------
+
+(variable_declarator
+ name: (identifier) @definition.var)
+
+(import_specifier
+ (identifier) @definition.import)
+
+(namespace_import
+ (identifier) @definition.import)
+
+(function_declaration
+ ((identifier) @definition.function)
+ (#set! definition.var.scope parent))
+
+(method_definition
+ ((property_identifier) @definition.function)
+ (#set! definition.var.scope parent))
+
+; References
+;------------
+
+(identifier) @reference
+(shorthand_property_identifier) @reference
diff --git a/runtime/queries/eex/highlights.scm b/queries/eex/highlights.scm
similarity index 65%
rename from runtime/queries/eex/highlights.scm
rename to queries/eex/highlights.scm
index d032a7486..781b39466 100644
--- a/runtime/queries/eex/highlights.scm
+++ b/queries/eex/highlights.scm
@@ -9,4 +9,7 @@
] @tag.delimiter
; EEx comments are highlighted as such
-(comment) @comment @spell
+(comment) @comment
+
+; Tree-sitter parser errors
+(ERROR) @error
diff --git a/queries/eex/injections.scm b/queries/eex/injections.scm
new file mode 100644
index 000000000..f43206f55
--- /dev/null
+++ b/queries/eex/injections.scm
@@ -0,0 +1,5 @@
+; EEx expressions are Elixir
+(expression) @elixir
+
+; EEx expressions can span multiple interpolated lines
+(partial_expression) @elixir @combined
diff --git a/runtime/queries/elixir/folds.scm b/queries/elixir/folds.scm
similarity index 85%
rename from runtime/queries/elixir/folds.scm
rename to queries/elixir/folds.scm
index 7abfe6797..b99a6d9e0 100644
--- a/runtime/queries/elixir/folds.scm
+++ b/queries/elixir/folds.scm
@@ -1,6 +1,5 @@
[
(anonymous_function)
- (stab_clause)
(arguments)
(block)
(do_block)
diff --git a/queries/elixir/highlights.scm b/queries/elixir/highlights.scm
new file mode 100644
index 000000000..c3aee40c7
--- /dev/null
+++ b/queries/elixir/highlights.scm
@@ -0,0 +1,227 @@
+; Punctuation
+[
+ ","
+ ";"
+] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "<<"
+ ">>"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+[
+ "%"
+] @punctuation.special
+
+; Parser Errors
+(ERROR) @error
+
+; Identifiers
+(identifier) @variable
+
+; Unused Identifiers
+((identifier) @comment (#match? @comment "^_"))
+
+; Comments
+(comment) @comment
+(comment) @spell
+
+; Strings
+(string) @string
+(string) @spell
+
+; Modules
+(alias) @type
+
+; Atoms & Keywords
+[
+ (atom)
+ (quoted_atom)
+ (keyword)
+ (quoted_keyword)
+] @symbol
+
+; Interpolation
+(interpolation ["#{" "}"] @string.special)
+
+; Escape sequences
+(escape_sequence) @string.escape
+
+; Integers
+(integer) @number
+
+; Floats
+(float) @float
+
+; Characters
+[
+ (char)
+ (charlist)
+] @character
+
+; Booleans
+(boolean) @boolean
+
+; Nil
+(nil) @constant.builtin
+
+; Operators
+(operator_identifier) @operator
+
+(unary_operator operator: _ @operator)
+
+(binary_operator operator: _ @operator)
+
+; Pipe Operator
+(binary_operator operator: "|>" right: (identifier) @function)
+
+(dot operator: _ @operator)
+
+(stab_clause operator: _ @operator)
+
+; Local Function Calls
+(call target: (identifier) @function.call)
+
+; Remote Function Calls
+(call target: (dot left: [
+ (atom) @type
+ (_)
+] right: (identifier) @function.call) (arguments))
+
+; Definition Function Calls
+(call target: ((identifier) @keyword.function (#any-of? @keyword.function
+ "def"
+ "defdelegate"
+ "defexception"
+ "defguard"
+ "defguardp"
+ "defimpl"
+ "defmacro"
+ "defmacrop"
+ "defmodule"
+ "defn"
+ "defnp"
+ "defoverridable"
+ "defp"
+ "defprotocol"
+ "defstruct"
+)) (arguments [
+ (identifier) @function
+ (binary_operator left: (identifier) @function operator: "when")])?)
+
+; Kernel Keywords & Special Forms
+(call target: ((identifier) @keyword (#any-of? @keyword
+ "alias"
+ "case"
+ "catch"
+ "cond"
+ "else"
+ "for"
+ "if"
+ "import"
+ "quote"
+ "raise"
+ "receive"
+ "require"
+ "reraise"
+ "super"
+ "throw"
+ "try"
+ "unless"
+ "unquote"
+ "unquote_splicing"
+ "use"
+ "with"
+)))
+
+; Special Constants
+((identifier) @constant.builtin (#any-of? @constant.builtin
+ "__CALLER__"
+ "__DIR__"
+ "__ENV__"
+ "__MODULE__"
+ "__STACKTRACE__"
+))
+
+; Reserved Keywords
+[
+ "after"
+ "catch"
+ "do"
+ "end"
+ "fn"
+ "rescue"
+ "when"
+ "else"
+] @keyword
+
+; Operator Keywords
+[
+ "and"
+ "in"
+ "not in"
+ "not"
+ "or"
+] @keyword.operator
+
+; Capture Operator
+(unary_operator
+ operator: "&"
+ operand: [
+ (integer) @operator
+ (binary_operator
+ left: [
+ (call target: (dot left: (_) right: (identifier) @function))
+ (identifier) @function
+ ] operator: "/" right: (integer) @operator)
+ ])
+
+; Non-String Sigils
+(sigil
+ "~" @string.special
+ ((sigil_name) @string.special) @_sigil_name
+ quoted_start: _ @string.special
+ quoted_end: _ @string.special
+ ((sigil_modifiers) @string.special)?
+ (#not-any-of? @_sigil_name "s" "S"))
+
+; String Sigils
+(sigil
+ "~" @string
+ ((sigil_name) @string) @_sigil_name
+ quoted_start: _ @string
+ (quoted_content) @string
+ quoted_end: _ @string
+ ((sigil_modifiers) @string)?
+ (#any-of? @_sigil_name "s" "S"))
+
+; Module attributes
+(unary_operator
+ operator: "@"
+ operand: [
+ (identifier)
+ (call target: (identifier))
+ ] @constant) @constant
+
+; Documentation
+(unary_operator
+ operator: "@"
+ operand: (call
+ target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc")) @comment
+ (arguments [
+ (string)
+ (boolean)
+ (charlist)
+ (sigil
+ "~" @comment
+ ((sigil_name) @comment)
+ quoted_start: _ @comment
+ (quoted_content) @comment
+ quoted_end: _ @comment)
+ ] @comment))) @comment
diff --git a/runtime/queries/elixir/indents.scm b/queries/elixir/indents.scm
similarity index 62%
rename from runtime/queries/elixir/indents.scm
rename to queries/elixir/indents.scm
index 5470b6422..517f66940 100644
--- a/runtime/queries/elixir/indents.scm
+++ b/queries/elixir/indents.scm
@@ -6,7 +6,7 @@
(stab_clause)
(tuple)
(arguments)
-] @indent.begin
+] @indent
[
")"
@@ -17,9 +17,7 @@
"rescue"
"}"
"end"
-] @indent.end @indent.branch
+] @indent_end @branch
; Elixir pipelines are not indented, but other binary operator chains are
-((binary_operator
- operator: _ @_operator) @indent.begin
- (#not-eq? @_operator "|>"))
+((binary_operator operator: _ @_operator) @indent (#not-eq? @_operator "|>"))
diff --git a/queries/elixir/injections.scm b/queries/elixir/injections.scm
new file mode 100644
index 000000000..423fddea7
--- /dev/null
+++ b/queries/elixir/injections.scm
@@ -0,0 +1,48 @@
+; Comments
+(comment) @comment
+
+; Documentation
+(unary_operator
+ operator: "@"
+ operand: (call
+ target: ((identifier) @_identifier (#any-of? @_identifier "moduledoc" "typedoc" "shortdoc" "doc"))
+ (arguments [
+ (string (quoted_content) @markdown)
+ (sigil (quoted_content) @markdown)
+ ])))
+
+; HEEx
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @heex
+(#eq? @_sigil_name "H"))
+
+; Surface
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @surface
+(#eq? @_sigil_name "F"))
+
+; Zigler
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @eex
+(#any-of? @_sigil_name "E" "L"))
+
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @zig
+(#any-of? @_sigil_name "z" "Z"))
+
+; Regex
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @regex
+(#any-of? @_sigil_name "r" "R"))
+
+; Jason
+(sigil
+ (sigil_name) @_sigil_name
+ (quoted_content) @json
+(#any-of? @_sigil_name "j" "J"))
+
diff --git a/queries/elixir/locals.scm b/queries/elixir/locals.scm
new file mode 100644
index 000000000..79a9676df
--- /dev/null
+++ b/queries/elixir/locals.scm
@@ -0,0 +1,164 @@
+; References
+(identifier) @reference
+(alias) @reference
+
+; Module Definitions
+(call
+ target: ((identifier) @_identifier (#eq? @_identifier "defmodule"))
+ (arguments (alias) @definition.type))
+
+; 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)))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (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: "=")
+
+; Stab Clause Definitions
+(stab_clause
+ left: [
+ (arguments [
+ (identifier) @definition.var
+ (_ (identifier) @definition.var)
+ (_ (_ (identifier) @definition.var))
+ (_ (_ (_ (identifier) @definition.var)))
+ (_ (_ (_ (_ (identifier) @definition.var))))
+ (_ (_ (_ (_ (_ (identifier) @definition.var)))))
+ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))
+ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))))))))))
+ ])
+ (binary_operator
+ left: (arguments [
+ (identifier) @definition.var
+ (_ (identifier) @definition.var)
+ (_ (_ (identifier) @definition.var))
+ (_ (_ (_ (identifier) @definition.var)))
+ (_ (_ (_ (_ (identifier) @definition.var))))
+ (_ (_ (_ (_ (_ (identifier) @definition.var)))))
+ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))
+ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var)))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.var))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (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: "when")
+])
+
+; 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))))
+ ]
+))
+
+; Local Function Definitions & Scopes
+(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 operator: "when")
+ (binary_operator (identifier) @definition.parameter)
+ (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)))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (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)
+ (do_block)?
+) @scope
+
+; ExUnit Test Definitions & Scopes
+(call
+ target: ((identifier) @_identifier (#eq? @_identifier "test"))
+ (arguments [
+ (string)
+ ((string) . "," . [
+ (identifier) @definition.parameter
+ (_ (identifier) @definition.parameter)
+ (_ (_ (identifier) @definition.parameter))
+ (_ (_ (_ (identifier) @definition.parameter)))
+ (_ (_ (_ (_ (identifier) @definition.parameter))))
+ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))
+ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))
+ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter)))))))))))))))))))
+ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (_ (identifier) @definition.parameter))))))))))))))))))))
+ ])
+]) (do_block)?) @scope
+
+; Stab Clause Scopes
+(stab_clause) @scope
diff --git a/queries/elm/highlights.scm b/queries/elm/highlights.scm
new file mode 100644
index 000000000..63514eb3e
--- /dev/null
+++ b/queries/elm/highlights.scm
@@ -0,0 +1,98 @@
+[(line_comment) (block_comment)] @comment
+
+; Keywords
+[
+ "if"
+ "then"
+ "else"
+ (case)
+ (of)
+] @conditional
+
+[
+ "let"
+ "in"
+ (as)
+ (port)
+ (exposing)
+ (alias)
+ (infix)
+ (module)
+] @keyword
+
+[
+ (double_dot)
+ "|"
+] @punctuation.special
+[
+ ","
+ (dot)
+] @punctuation.delimiter
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+] @punctuation.bracket
+
+(type_annotation
+ (lower_case_identifier) @function)
+(port_annotation
+ (lower_case_identifier) @function)
+(function_declaration_left
+ (lower_case_identifier) @function)
+(function_call_expr
+ target: (value_expr) @function)
+
+(value_qid (upper_case_identifier) @constructor)
+(value_qid ((dot) (lower_case_identifier) @field))
+(field_access_expr ((dot) (lower_case_identifier) @field))
+
+(lower_pattern) @parameter
+(record_base_identifier) @method
+
+[
+ (backslash)
+ (underscore)
+] @function
+
+[
+ (operator_identifier)
+ (eq)
+ (colon)
+ (arrow)
+] @operator
+
+(import) @include
+
+(number_constant_expr) @number
+
+(type) @keyword
+
+(module_declaration
+ (upper_case_qid (upper_case_identifier)) @constructor)
+(type_declaration
+ (upper_case_identifier) @constructor)
+(type_ref) @type
+(type_alias_declaration
+ name: (upper_case_identifier) @type.definition)
+(field_type name:
+ (lower_case_identifier) @property)
+
+(union_variant
+ (upper_case_identifier) @symbol)
+(union_pattern) @symbol
+(value_expr
+ (upper_case_qid (upper_case_identifier)) @symbol)
+
+; strings
+(string_escape) @string
+(open_quote) @string
+(close_quote) @string
+(regular_string_part) @string
+
+[
+ (open_char)
+ (close_char)
+] @character
diff --git a/queries/elm/injections.scm b/queries/elm/injections.scm
new file mode 100644
index 000000000..6395776e1
--- /dev/null
+++ b/queries/elm/injections.scm
@@ -0,0 +1,3 @@
+[(line_comment) (block_comment)] @comment
+
+(glsl_content) @glsl
diff --git a/queries/elvish/highlights.scm b/queries/elvish/highlights.scm
new file mode 100644
index 000000000..af7c41dd8
--- /dev/null
+++ b/queries/elvish/highlights.scm
@@ -0,0 +1,70 @@
+(comment) @comment
+
+["if" "elif"] @conditional
+(if (else "else" @conditional))
+
+["while" "for"] @repeat
+(while (else "else" @repeat))
+(for (else "else" @repeat))
+
+["try" "catch" "finally"] @exception
+(try (else "else" @exception))
+
+"use" @include
+(import (bareword) @string.special)
+
+(wildcard ["*" "**" "?"] @character.special)
+
+(command argument: (bareword) @parameter)
+(command head: (identifier) @function.call)
+((command head: (identifier) @keyword.return)
+ (#eq? @keyword.return "return"))
+((command (identifier) @keyword.operator)
+ (#any-of? @keyword.operator "and" "or" "coalesce"))
+[
+ "+" "-" "*" "/" "%" "<" "<=""==" "!=" ">"
+ ">=" "s" ">=s"
+] @function.builtin
+
+[">" "<" ">>" "<>" "|"] @operator
+
+(io_port) @number
+
+(function_definition
+ "fn" @keyword.function
+ (identifier) @function)
+
+(parameter_list) @parameter
+(parameter_list "|" @punctuation.bracket)
+
+["var" "set" "tmp" "del"] @keyword
+(variable_declaration
+ (lhs (identifier) @variable))
+
+(variable_assignment
+ (lhs (identifier) @variable))
+
+(temporary_assignment
+ (lhs (identifier) @variable))
+
+(variable_deletion
+ (identifier) @variable)
+
+
+(number) @number
+(string) @string
+
+(variable (identifier) @variable)
+((variable (identifier) @function)
+ (#match? @function ".+\\~$"))
+((variable (identifier) @boolean)
+ (#any-of? @boolean "true" "false"))
+((variable (identifier) @constant.builtin)
+ (#any-of? @constant.builtin
+ "_" "after-chdir" "args" "before-chdir" "buildinfo" "nil"
+ "notify-bg-job-success" "num-bg-jobs" "ok" "paths" "pid"
+ "pwd" "value-out-indicator" "version"))
+
+["$" "@"] @punctuation.special
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+";" @punctuation.delimiter
diff --git a/queries/elvish/injections.scm b/queries/elvish/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/elvish/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/embedded_template/highlights.scm b/queries/embedded_template/highlights.scm
similarity index 67%
rename from runtime/queries/embedded_template/highlights.scm
rename to queries/embedded_template/highlights.scm
index 410983d65..0bf76a7d4 100644
--- a/runtime/queries/embedded_template/highlights.scm
+++ b/queries/embedded_template/highlights.scm
@@ -1,4 +1,4 @@
-(comment_directive) @comment @spell
+(comment_directive) @comment
[
"<%#"
diff --git a/queries/embedded_template/injections.scm b/queries/embedded_template/injections.scm
new file mode 100644
index 000000000..d55c87e09
--- /dev/null
+++ b/queries/embedded_template/injections.scm
@@ -0,0 +1,2 @@
+(content) @html @combined
+(code) @ruby @combined
diff --git a/runtime/queries/erlang/folds.scm b/queries/erlang/folds.scm
similarity index 88%
rename from runtime/queries/erlang/folds.scm
rename to queries/erlang/folds.scm
index 65c2d8ed1..35073e869 100644
--- a/runtime/queries/erlang/folds.scm
+++ b/queries/erlang/folds.scm
@@ -2,7 +2,6 @@
(fun_decl)
(anonymous_fun)
(case_expr)
- (maybe_expr)
(map_expr)
(export_attribute)
(export_type_attribute)
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
new file mode 100644
index 000000000..fba44359f
--- /dev/null
+++ b/queries/erlang/highlights.scm
@@ -0,0 +1,124 @@
+((atom) @constant (#set! "priority" "90"))
+(var) @variable
+
+(char) @character
+(integer) @number
+(float) @float
+
+(comment) @comment
+
+;; keyword
+[
+ "fun"
+ "div"
+] @keyword
+
+;; bracket
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+ "#"
+] @punctuation.bracket
+
+;;; Comparisons
+[
+ "=="
+ "=:="
+ "=/="
+ "=<"
+ ">="
+ "<"
+ ">"
+] @operator ;; .comparison
+
+;;; operator
+[
+ ":"
+ ":="
+ "!"
+ ;; "-"
+ "+"
+ "="
+ "->"
+ "=>"
+ "|"
+] @operator
+
+[
+ ","
+ "."
+ ";"
+] @punctuation.delimiter
+
+;; conditional
+([
+ "receive"
+ "if"
+ "case"
+ "of"
+ "when"
+ "after"
+ "end"
+] @conditional (#set! "priority" 95))
+
+[
+ "catch"
+ "try"
+] @exception
+
+((atom) @boolean (#any-of? @boolean "true" "false"))
+
+;; Macros
+((macro_call_expr) @constant.macro (#set! "priority" 101))
+
+;; Preprocessor
+(pp_define
+ lhs: _ @constant.macro (#set! "priority" 101)
+)
+(_preprocessor_directive) @preproc (#set! "priority" 99)
+
+;; Attributes
+(pp_include) @include
+(pp_include_lib) @include
+(export_attribute) @include
+(export_type_attribute) @type.definition
+(export_type_attribute types: (fa fun: _ @type (#set! "priority" 101)))
+(behaviour_attribute) @include
+(module_attribute (atom) @namespace) @include
+(wild_attribute name: (attr_name name: _ @attribute)) @attribute
+
+;; Records
+(record_expr) @type
+(record_field_expr _ @field) @type
+(record_field_name _ @field) @type
+(record_name "#" @type name: _ @type) @type
+(record_decl name: _ @type) @type.definition
+(record_field name: _ @field)
+(record_field name: _ @field ty: _ @type)
+
+;; Type alias
+(type_alias name: _ @type) @type.definition
+(spec) @type.definition
+
+(comment) @comment
+[(string) (binary)] @string
+
+;;; expr_function_call
+(call expr: [(atom) (remote) (var)] @function)
+(call (atom) @exception (#any-of? @exception "error" "throw" "exit"))
+
+;;; Parenthesized expression: (SomeFunc)(), only highlight the parens
+(call
+ expr: (paren_expr "(" @function.call ")" @function.call)
+)
+
+;;; function
+(external_fun) @function.call
+(internal_fun fun: (atom) @function.call)
+(function_clause name: (atom) @function)
+(fa fun: (atom) @function)
+
diff --git a/queries/fennel/highlights.scm b/queries/fennel/highlights.scm
new file mode 100644
index 000000000..7322e55c3
--- /dev/null
+++ b/queries/fennel/highlights.scm
@@ -0,0 +1,121 @@
+(comment) @comment
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+ ":"
+ ":until"
+ "&"
+ "&as"
+ "?"
+] @punctuation.special
+
+(nil) @constant.builtin
+(vararg) @punctuation.special
+
+(boolean) @boolean
+(number) @number
+
+(string) @string
+(escape_sequence) @string.escape
+
+(symbol) @variable
+
+(multi_symbol
+ "." @punctuation.delimiter
+ (symbol) @field)
+
+(multi_symbol_method
+ ":" @punctuation.delimiter
+ (symbol) @method .)
+
+(list . (symbol) @function)
+(list . (multi_symbol (symbol) @function .))
+
+((symbol) @variable.builtin
+ (#match? @variable.builtin "^[$]"))
+
+(binding) @symbol
+
+[
+ "fn"
+ "lambda"
+ "hashfn"
+ "#"
+] @keyword.function
+
+(fn name: [
+ (symbol) @function
+ (multi_symbol (symbol) @function .)
+])
+
+(lambda name: [
+ (symbol) @function
+ (multi_symbol (symbol) @function .)
+])
+
+[
+ "for"
+ "each"
+] @repeat
+((symbol) @repeat
+ (#any-of? @repeat
+ "while"))
+
+[
+ "match"
+] @conditional
+((symbol) @conditional
+ (#any-of? @conditional
+ "if" "when"))
+
+[
+ "global"
+ "local"
+ "let"
+ "set"
+ "var"
+ "where"
+ "or"
+] @keyword
+((symbol) @keyword
+ (#any-of? @keyword
+ "comment" "do" "doc" "eval-compiler" "lua" "macros" "quote" "tset" "values"))
+
+((symbol) @include
+ (#any-of? @include
+ "require" "require-macros" "import-macros" "include"))
+
+[
+ "collect"
+ "icollect"
+ "accumulate"
+] @function.macro
+
+((symbol) @function.macro
+ (#any-of? @function.macro
+ "->" "->>" "-?>" "-?>>" "?." "doto" "macro" "macrodebug" "partial" "pick-args"
+ "pick-values" "with-open"))
+
+; Lua builtins
+((symbol) @constant.builtin
+ (#any-of? @constant.builtin
+ "arg" "_ENV" "_G" "_VERSION"))
+
+((symbol) @function.builtin
+ (#any-of? @function.builtin
+ "assert" "collectgarbage" "dofile" "error" "getmetatable" "ipairs"
+ "load" "loadfile" "next" "pairs" "pcall" "print" "rawequal" "rawget"
+ "rawlen" "rawset" "require" "select" "setmetatable" "tonumber" "tostring"
+ "type" "warn" "xpcall"))
+
+((symbol) @function.builtin
+ (#any-of? @function.builtin
+ "loadstring" "module" "setfenv" "unpack"))
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/fennel/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/fennel/locals.scm b/queries/fennel/locals.scm
new file mode 100644
index 000000000..3018732f9
--- /dev/null
+++ b/queries/fennel/locals.scm
@@ -0,0 +1,26 @@
+[
+ (program)
+ (fn)
+ (lambda)
+ (let)
+ (each)
+ (for)
+ (match)
+] @scope
+
+(
+ (list . (symbol) @_special) @scope
+ (#any-of? @_special
+ "while" "if" "when" "do" "collect" "icollect" "accumulate")
+)
+
+(fn name: (symbol) @definition.function
+ (#set! definition.function.scope "parent"))
+(lambda name: (symbol) @definition.function
+ (#set! definition.function.scope "parent"))
+
+; TODO: use @definition.parameter for parameters
+(binding (symbol) @definition.var)
+(for_clause . (symbol) @definition.var)
+
+(symbol) @reference
diff --git a/queries/fish/folds.scm b/queries/fish/folds.scm
new file mode 100644
index 000000000..6075e2e04
--- /dev/null
+++ b/queries/fish/folds.scm
@@ -0,0 +1,8 @@
+[
+ (function_definition)
+ (if_statement)
+ (switch_statement)
+ (for_statement)
+ (while_statement)
+ (begin_statement)
+] @fold
diff --git a/queries/fish/highlights.scm b/queries/fish/highlights.scm
new file mode 100644
index 000000000..505726819
--- /dev/null
+++ b/queries/fish/highlights.scm
@@ -0,0 +1,169 @@
+;; Fish highlighting
+
+;; Operators
+
+[
+ "&&"
+ "||"
+ "|"
+ "&"
+ ".."
+ "!"
+ (direction)
+ (stream_redirect)
+] @operator
+
+;; match operators of test command
+(command
+ name: (word) @function.builtin (#match? @function.builtin "^test$")
+ argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
+
+;; match operators of [ command
+(test_command
+ argument: (word) @operator (#match? @operator "^(!?\\=|-[a-zA-Z]+)$"))
+
+[
+ "not"
+ "and"
+ "or"
+] @keyword.operator
+
+;; Conditionals
+
+(if_statement
+[
+ "if"
+ "end"
+] @conditional)
+
+(switch_statement
+[
+ "switch"
+ "end"
+] @conditional)
+
+(case_clause
+[
+ "case"
+] @conditional)
+
+(else_clause
+[
+ "else"
+] @conditional)
+
+(else_if_clause
+[
+ "else"
+ "if"
+] @conditional)
+
+;; Loops/Blocks
+
+(while_statement
+[
+ "while"
+ "end"
+] @repeat)
+
+(for_statement
+[
+ "for"
+ "end"
+] @repeat)
+
+(begin_statement
+[
+ "begin"
+ "end"
+] @repeat)
+
+;; Keywords
+
+[
+ "in"
+ (break)
+ (continue)
+] @keyword
+
+"return" @keyword.return
+
+;; Punctuation
+
+[
+ "["
+ "]"
+ "{"
+ "}"
+ "("
+ ")"
+] @punctuation.bracket
+
+"," @punctuation.delimiter
+
+;; Commands
+
+(command
+ argument: [
+ (word) @parameter (#match? @parameter "^-")
+ ]
+)
+
+(command_substitution "$" @punctuation.bracket)
+
+; non-bultin command names
+(command name: (word) @function.call)
+
+; derived from builtin -n (fish 3.2.2)
+(command
+ name: [
+ (word) @function.builtin
+ (#any-of? @function.builtin "." ":" "_" "alias" "argparse" "bg" "bind" "block" "breakpoint" "builtin" "cd" "command" "commandline" "complete" "contains" "count" "disown" "echo" "emit" "eval" "exec" "exit" "fg" "functions" "history" "isatty" "jobs" "math" "printf" "pwd" "random" "read" "realpath" "set" "set_color" "source" "status" "string" "test" "time" "type" "ulimit" "wait")
+ ]
+)
+
+(test_command (word) @function.builtin)
+
+;; Functions
+
+(function_definition ["function" "end"] @keyword.function)
+
+(function_definition
+ name: [
+ (word) (concatenation)
+ ]
+@function)
+
+(function_definition
+ option: [
+ (word)
+ (concatenation (word))
+ ] @parameter (#match? @parameter "^-")
+)
+
+;; Strings
+
+[(double_quote_string) (single_quote_string)] @string
+(escape_sequence) @string.escape
+
+;; Variables
+
+(variable_name) @variable
+(variable_expansion) @constant
+
+;; Nodes
+
+[(integer) (float)] @number
+(comment) @comment
+(comment) @spell
+
+((word) @boolean
+(#any-of? @boolean "true" "false"))
+
+((program . (comment) @preproc)
+ (#match? @preproc "^#!/"))
+
+;; Error
+
+(ERROR) @error
+
diff --git a/queries/fish/indents.scm b/queries/fish/indents.scm
new file mode 100644
index 000000000..cf8d62658
--- /dev/null
+++ b/queries/fish/indents.scm
@@ -0,0 +1,16 @@
+[
+ (function_definition)
+ (while_statement)
+ (for_statement)
+ (if_statement)
+ (begin_statement)
+ (switch_statement)
+] @indent
+
+[
+ (else_if_clause)
+ (else_clause)
+ "end"
+] @branch
+
+(comment) @ignore
diff --git a/queries/fish/injections.scm b/queries/fish/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/fish/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/fish/locals.scm b/queries/fish/locals.scm
similarity index 50%
rename from runtime/queries/fish/locals.scm
rename to queries/fish/locals.scm
index 904d568f9..a522c78dc 100644
--- a/runtime/queries/fish/locals.scm
+++ b/queries/fish/locals.scm
@@ -1,4 +1,4 @@
-; Scopes
+;; Scopes
[
(command)
(function_definition)
@@ -7,13 +7,12 @@
(begin_statement)
(while_statement)
(switch_statement)
-] @local.scope
+] @scope
-; Definitions
+;; Definitions
(function_definition
- name: (word) @local.definition.function)
+ name: (word) @definition.function)
-; References
-(variable_name) @local.reference
-
-(word) @local.reference
+;; References
+(variable_name) @reference
+(word) @reference
diff --git a/queries/foam/folds.scm b/queries/foam/folds.scm
new file mode 100644
index 000000000..2e499c2e2
--- /dev/null
+++ b/queries/foam/folds.scm
@@ -0,0 +1,7 @@
+[
+ (comment)
+ (list)
+ (dict_core)
+] @fold
+
+(code (code_body)* @fold)
diff --git a/queries/foam/highlights.scm b/queries/foam/highlights.scm
new file mode 100644
index 000000000..86a3bf324
--- /dev/null
+++ b/queries/foam/highlights.scm
@@ -0,0 +1,69 @@
+;; Comments
+(comment) @comment
+
+;; Generic Key-value pairs and dictionary keywords
+(key_value
+ keyword: (identifier) @function
+)
+(dict
+ key: (identifier) @type
+)
+
+;; Macros
+(macro
+ "$" @conditional
+ (prev_scope)* @conditional
+ (identifier)* @namespace
+)
+
+
+;; Directives
+"#" @conditional
+(preproc_call
+ directive: (identifier)* @conditional
+ argument: (identifier)* @namespace
+)
+(
+ (preproc_call
+ argument: (identifier)* @namespace
+ ) @conditional
+ (#match? @conditional "ifeq")
+)
+(
+ (preproc_call) @conditional
+ (#match? @conditional "(else|endif)")
+)
+
+;; Literal numbers and strings
+(number_literal) @float
+(string_literal) @string
+(escape_sequence) @string.escape
+
+;; Treat [m^2 s^-2] the same as if it was put in numbers format
+(dimensions dimension: (identifier) @float)
+
+;; Punctuation
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+ "#{"
+ "#}"
+ "|-"
+ "-|"
+ ""
+ "$$"
+] @punctuation.bracket
+
+[
+ ";"
+] @punctuation.delimiter
+
+;; Special identifiers
+([(identifier) "on" "off" "true" "false" "yes" "no"] @constant.builtin
+(#match? @constant.builtin "^(uniform|non-uniform|and|or|on|off|true|false|yes|no)$")
+)
diff --git a/queries/foam/indents.scm b/queries/foam/indents.scm
new file mode 100644
index 000000000..033700c17
--- /dev/null
+++ b/queries/foam/indents.scm
@@ -0,0 +1,11 @@
+[
+ "{"
+ "}"
+] @branch
+
+[(dict) (key_value)] @indent
+
+
+[
+ (comment)
+] @ignore
diff --git a/queries/foam/injections.scm b/queries/foam/injections.scm
new file mode 100644
index 000000000..4afdb63b0
--- /dev/null
+++ b/queries/foam/injections.scm
@@ -0,0 +1,12 @@
+;; Pass code blocks to Cpp highlighter
+(code (code_body) @cpp)
+
+;; Pass identifiers to Go highlighter (Cheating I know)
+;;((identifier) @lua)
+
+;; Highlight regex syntax inside literal strings
+((string_literal) @regex)
+
+;; Highlight PyFoam syntax as Python statements
+(pyfoam_variable code_body: (_) @python)
+(pyfoam_expression code_body: (_) @python)
diff --git a/queries/foam/locals.scm b/queries/foam/locals.scm
new file mode 100644
index 000000000..2abe743dd
--- /dev/null
+++ b/queries/foam/locals.scm
@@ -0,0 +1,6 @@
+(dict) @scope
+
+(dict key: (_) @definition.type)
+
+(key_value keyword: (_) @definition.parameter)
+(key_value value: (macro (identifier)*)* @reference)
diff --git a/queries/fortran/folds.scm b/queries/fortran/folds.scm
new file mode 100644
index 000000000..a2edc64d3
--- /dev/null
+++ b/queries/fortran/folds.scm
@@ -0,0 +1,11 @@
+;; by @oponkork
+[
+ (if_statement)
+ (where_statement)
+ (enum_statement)
+ (do_loop_statement)
+ (derived_type_definition)
+ (function)
+ (subroutine)
+ (interface)
+] @fold
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
new file mode 100644
index 000000000..09cf63ca5
--- /dev/null
+++ b/queries/fortran/highlights.scm
@@ -0,0 +1,185 @@
+(identifier) @variable
+(string_literal) @string
+(number_literal) @number
+(boolean_literal) @boolean
+(comment) @comment
+
+[
+ (intrinsic_type)
+ "pointer"
+] @type
+
+[
+ "allocatable"
+ "attributes"
+ "device"
+ "dimension"
+ "global"
+ "grid_global"
+ "host"
+ "optional"
+ "private"
+ "public"
+ "value"
+] @type.qualifier
+
+[
+ "endtype"
+ "type"
+] @type.definition
+
+[
+ "in"
+ "inout"
+ "out"
+] @storageclass
+
+[
+ "contains"
+ "import"
+] @include
+
+[
+ (none)
+ "implicit"
+ "intent"
+] @attribute
+
+[
+ "endfunction"
+ "endprogram"
+ "endsubroutine"
+ "function"
+ "procedure"
+ "subroutine"
+] @keyword.function
+
+[
+ "bind"
+ "call"
+ "class"
+ "continue"
+ "cycle"
+ "endenum"
+ "endinterface"
+ "endmodule"
+ "endprogram"
+ "enum"
+ "enumerator"
+ "equivalence"
+ "exit"
+ "format"
+ "goto"
+ "include"
+ "interface"
+ "module"
+ "namelist"
+ "only"
+ "parameter"
+ "print"
+ "program"
+ "read"
+ "stop"
+ "use"
+ "write"
+ (default)
+ (procedure_qualifier)
+] @keyword
+
+"return" @keyword.return
+
+[
+ "else"
+ "elseif"
+ "endif"
+ "endwhere"
+ "if"
+ "then"
+ "where"
+] @conditional
+
+[
+ "do"
+ "enddo"
+ "forall"
+ "while"
+] @repeat
+
+[
+ "*"
+ "+"
+ "-"
+ "/"
+ "="
+ "<"
+ ">"
+ "<="
+ ">="
+ "=="
+ "/="
+] @operator
+
+[
+ "\\.and\\."
+ "\\.or\\."
+ "\\.lt\\."
+ "\\.gt\\."
+ "\\.ge\\."
+ "\\.le\\."
+ "\\.eq\\."
+ "\\.eqv\\."
+ "\\.neqv\\."
+] @keyword.operator
+
+ ;; Brackets
+ [
+ "("
+ ")"
+ "["
+ "]"
+ "<<<"
+ ">>>"
+ ] @punctuation.bracket
+
+ ;; Delimiter
+ [
+ "::"
+ ","
+ "%"
+ ] @punctuation.delimiter
+
+(parameters
+ (identifier) @parameter)
+
+(program_statement
+ (name) @namespace)
+
+(module_statement
+ (name) @namespace)
+
+(function_statement
+ (name) @function)
+
+(subroutine_statement
+ (name) @function)
+
+(end_program_statement
+ (name) @namespace)
+
+(end_module_statement
+ (name) @namespace)
+
+(end_function_statement
+ (name) @function)
+
+(end_subroutine_statement
+ (name) @function)
+
+(subroutine_call
+ (name) @function)
+
+(keyword_argument
+ name: (identifier) @keyword)
+
+(derived_type_member_expression
+ (type_member) @property)
diff --git a/runtime/queries/fortran/indents.scm b/queries/fortran/indents.scm
similarity index 90%
rename from runtime/queries/fortran/indents.scm
rename to queries/fortran/indents.scm
index 0f9ba3d7e..67fa046de 100644
--- a/runtime/queries/fortran/indents.scm
+++ b/queries/fortran/indents.scm
@@ -5,11 +5,11 @@
(function)
; (interface)
(if_statement)
- (do_loop)
+ (do_loop_statement)
(where_statement)
(derived_type_definition)
(enum)
-] @indent.begin
+] @indent
[
(end_module_statement)
@@ -24,4 +24,4 @@
(end_type_statement)
(end_enum_statement)
(end_where_statement)
-] @indent.branch
+] @branch
diff --git a/runtime/queries/hcl/folds.scm b/queries/fusion/folds.scm
similarity index 50%
rename from runtime/queries/hcl/folds.scm
rename to queries/fusion/folds.scm
index e0c5313a2..179fc160b 100644
--- a/runtime/queries/hcl/folds.scm
+++ b/queries/fusion/folds.scm
@@ -1,6 +1,6 @@
[
(comment)
(block)
- (heredoc_template)
- (object)
+ (afx_comment)
+ (afx_element)
] @fold
diff --git a/queries/fusion/highlights.scm b/queries/fusion/highlights.scm
new file mode 100644
index 000000000..b093f8872
--- /dev/null
+++ b/queries/fusion/highlights.scm
@@ -0,0 +1,120 @@
+(comment) @comment
+(afx_comment) @comment
+
+; identifiers afx
+(afx_opening_element
+ (afx_identifier) @tag)
+(afx_closing_element
+ (afx_identifier) @tag)
+(afx_element_self_closing
+ (afx_identifier) @tag)
+
+(afx_attribute
+ (afx_property_identifier) @tag.attribute)
+
+(afx_text) @text
+
+; identifiers eel
+
+(eel_object_path
+ (eel_path_identifier) @variable.builtin
+ (#match? @variable.builtin "^(this|props)$")
+)
+
+(eel_object_path
+ (eel_path_identifier) @variable)
+
+(eel_object_pair
+ key: (eel_property_name) @property)
+
+(eel_method_name) @function
+
+(eel_parameter) @variable
+
+; identifiers fusion
+; -----------
+
+(path_part) @property
+(meta_property) @attribute
+(prototype_signature
+ "prototype" @keyword
+
+)
+(include_statement
+ [
+ "include"
+ ] @include
+ (source_file) @text.uri
+)
+
+(namespace_declaration
+ "namespace" @keyword
+ (alias_namespace) @namespace)
+
+(type
+ name: (type_name) @type)
+
+; tokens
+; ------
+(afx_opening_element
+ [
+ "<"
+ ">"
+ ] @punctuation.bracket)
+
+ (afx_closing_element
+ [
+ "<"
+ ">"
+ "/"
+ ] @punctuation.bracket)
+
+(afx_element_self_closing
+ [
+ "<"
+ "/>"
+ ] @punctuation.bracket)
+
+[
+ (package_name)
+ (alias_namespace)
+] @namespace
+
+(namespace_declaration "=" @operator)
+(assignment "=" @operator)
+(copy "<" @operator)
+(deletion) @operator
+(eel_binary_expression
+ operator: _ @operator)
+(eel_not_expression
+ [
+ "!"
+ "not"
+ ] @operator)
+
+(string) @string
+(number) @number
+(boolean) @boolean
+(null) @constant.builtin
+
+(value_expression
+ start: _ @punctuation.special
+ end: _ @punctuation.special
+)
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+ ":"
+ "."
+ "?"
+] @punctuation.delimiter
+
+(eel_ternary_expression
+ ["?" ":"] @conditional.ternary)
diff --git a/queries/fusion/indents.scm b/queries/fusion/indents.scm
new file mode 100644
index 000000000..68c57d528
--- /dev/null
+++ b/queries/fusion/indents.scm
@@ -0,0 +1,19 @@
+[
+ (block)
+ (value_dsl)
+ (afx_element)
+ (afx_element_self_closing)
+ (eel_array)
+ (eel_object)
+] @indent
+
+
+(block end: _ @branch)
+(value_dsl end: _ @branch)
+(eel_array end: _ @branch)
+(eel_object end: _ @branch)
+[
+ (afx_closing_element)
+] @branch
+
+(comment) @ignore
diff --git a/queries/fusion/locals.scm b/queries/fusion/locals.scm
new file mode 100644
index 000000000..24dc57bbe
--- /dev/null
+++ b/queries/fusion/locals.scm
@@ -0,0 +1,21 @@
+;; Fusion base
+(block) @scope
+
+(namespace_declaration
+ (alias_namespace) @definition.namespace)
+
+(property
+ (path (path_part) @definition.field))
+
+(type
+ namespace: (package_name)? @definition.namespace
+ name: (type_name) @definition.type
+)
+
+;; Eel Expressions
+(eel_arrow_function) @scope
+(eel_object) @scope
+
+(eel_parameter) @definition.parameter
+(eel_object_pair
+ key: (eel_property_name) @definition.field)
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
new file mode 100644
index 000000000..7b5469f62
--- /dev/null
+++ b/queries/gdscript/highlights.scm
@@ -0,0 +1,126 @@
+;; Basic
+(identifier) @variable
+(name) @variable
+(type) @type
+(comment) @comment
+(get_node) @string
+(string) @string
+(float) @float
+(integer) @number
+(null) @constant
+(setter) @function
+(getter) @function
+(static_keyword) @type.qualifier
+(tool_statement) @keyword
+(breakpoint_statement) @keyword
+(inferred_type) @operator
+[(true) (false)] @boolean
+
+(class_name_statement
+ (name) @type) @keyword
+
+(const_statement
+ "const" @type.qualifier
+ (name) @constant)
+
+((identifier) @variable.builtin
+ (#eq? @variable.builtin "self"))
+
+;; 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
+
+(function_definition
+ (name) @function (parameters
+ (identifier) @parameter)*)
+
+(typed_parameter
+ (identifier) @parameter)
+
+(default_parameter
+ (identifier) @parameter)
+
+(call
+ (identifier) @function)
+(attribute_call
+ (identifier) @function)
+
+;; Alternations
+["(" ")" "[" "]" "{" "}"] @punctuation.bracket
+
+["," "." ":"] @punctuation.delimiter
+
+["if" "elif" "else" "match"] @conditional
+
+["for" "while" "break" "continue"] @repeat
+
+[
+ "~"
+ "-"
+ "*"
+ "/"
+ "%"
+ "+"
+ "-"
+ "<<"
+ ">>"
+ "&"
+ "^"
+ "|"
+ "<"
+ ">"
+ "=="
+ "!="
+ ">="
+ "<="
+ "!"
+ "&&"
+ "||"
+ "="
+ "+="
+ "-="
+ "*="
+ "/="
+ "%="
+ "&="
+ "|="
+ "->"
+] @operator
+
+[
+ "and"
+ "as"
+ "in"
+ "is"
+ "not"
+ "or"
+] @keyword.operator
+
+[
+ "pass"
+ "class"
+ "class_name"
+ "extends"
+ "signal"
+ "func"
+ "enum"
+ "var"
+ "onready"
+ "export"
+ "setget"
+ "remote"
+ "master"
+ "puppet"
+ "remotesync"
+ "mastersync"
+ "puppetsync"
+] @keyword
+
+"return" @keyword.return
diff --git a/queries/gdscript/indents.scm b/queries/gdscript/indents.scm
new file mode 100644
index 000000000..80b78234d
--- /dev/null
+++ b/queries/gdscript/indents.scm
@@ -0,0 +1,24 @@
+[
+ (if_statement)
+
+ (for_statement)
+ (while_statement)
+
+ (parenthesized_expression)
+
+ (function_definition)
+ (class_definition)
+] @indent
+
+((argument_list) @aligned_indent
+ (#set! "delimiter" "()"))
+((parameters) @aligned_indent
+ (#set! "delimiter" "()"))
+
+[
+ ")"
+ "]"
+ "}"
+ (elif_clause)
+ (else_clause)
+] @branch
diff --git a/queries/gdscript/injections.scm b/queries/gdscript/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/gdscript/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/gdscript/locals.scm b/queries/gdscript/locals.scm
new file mode 100644
index 000000000..313af2aef
--- /dev/null
+++ b/queries/gdscript/locals.scm
@@ -0,0 +1,10 @@
+(function_definition) @definition.function
+
+[
+ (extends_statement)
+ (variable_statement)
+ (expression_statement)
+ (if_statement)
+ (function_definition)
+ (body)
+] @scope
diff --git a/runtime/queries/git_rebase/highlights.scm b/queries/git_rebase/highlights.scm
similarity index 74%
rename from runtime/queries/git_rebase/highlights.scm
rename to queries/git_rebase/highlights.scm
index 248366e24..466bd2f16 100644
--- a/runtime/queries/git_rebase/highlights.scm
+++ b/queries/git_rebase/highlights.scm
@@ -1,7 +1,8 @@
((command) @keyword
(label)? @constant
- (message)? @none @spell)
+ (message)? @text @spell)
(option) @operator
(comment) @comment
+
diff --git a/queries/git_rebase/injections.scm b/queries/git_rebase/injections.scm
new file mode 100644
index 000000000..27388618e
--- /dev/null
+++ b/queries/git_rebase/injections.scm
@@ -0,0 +1,5 @@
+((operation
+ (command) @_command
+ (message) @bash)
+(#any-of? @_command "exec" "x"))
+
diff --git a/runtime/queries/gitattributes/highlights.scm b/queries/gitattributes/highlights.scm
similarity index 62%
rename from runtime/queries/gitattributes/highlights.scm
rename to queries/gitattributes/highlights.scm
index aec7750f6..73ec71438 100644
--- a/runtime/queries/gitattributes/highlights.scm
+++ b/queries/gitattributes/highlights.scm
@@ -1,15 +1,12 @@
(dir_sep) @punctuation.delimiter
(quoted_pattern
- "\"" @punctuation.special)
+ ("\"" @punctuation.special))
(range_notation) @string.special
(range_notation
- [
- "["
- "]"
- ] @punctuation.bracket)
+ [ "[" "]" ] @punctuation.bracket)
(wildcard) @character.special
@@ -17,8 +14,7 @@
(character_class) @constant
-(class_range
- "-" @operator)
+(class_range ("-" @operator))
[
(ansi_c_escape)
@@ -26,7 +22,7 @@
] @string.escape
(attribute
- (attr_name) @variable.parameter)
+ (attr_name) @parameter)
(attribute
(builtin_attr) @variable.builtin)
@@ -41,15 +37,17 @@
(string_value) @string
-(macro_tag) @keyword.directive
+(macro_tag) @preproc
(macro_def
macro_name: (_) @property)
-; we do not lint syntax errors
-; [
-; (pattern_negation)
-; (redundant_escape)
-; (trailing_slash)
-; ] @error
+[
+ (pattern_negation)
+ (redundant_escape)
+ (trailing_slash)
+] @error
+
+(ERROR) @error
+
(comment) @comment @spell
diff --git a/queries/gitattributes/injections.scm b/queries/gitattributes/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/gitattributes/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/gitcommit/highlights.scm b/queries/gitcommit/highlights.scm
new file mode 100644
index 000000000..ff0c4ddb3
--- /dev/null
+++ b/queries/gitcommit/highlights.scm
@@ -0,0 +1,33 @@
+(comment) @comment
+(generated_comment) @comment
+(title) @text.title
+(text) @text
+(branch) @text.reference
+(change) @keyword
+(filepath) @text.uri
+(arrow) @punctuation.delimiter
+
+(subject) @text.title @spell
+(subject (overflow) @text @spell)
+(prefix (type) @keyword @nospell)
+(prefix (scope) @parameter @nospell)
+(prefix [
+ "("
+ ")"
+ ":"
+] @punctuation.delimiter)
+(prefix [
+ "!"
+] @punctuation.special)
+
+(message) @text @spell
+
+(trailer (token) @label)
+(trailer (value) @text)
+
+(breaking_change (token) @text.warning)
+(breaking_change (value) @text @spell)
+
+(scissor) @comment
+
+(ERROR) @error
diff --git a/queries/gitcommit/injections.scm b/queries/gitcommit/injections.scm
new file mode 100644
index 000000000..eecdeee47
--- /dev/null
+++ b/queries/gitcommit/injections.scm
@@ -0,0 +1,2 @@
+((diff) @diff (#exclude_children! @diff))
+(rebase_command) @git_rebase
diff --git a/runtime/queries/gitignore/highlights.scm b/queries/gitignore/highlights.scm
similarity index 76%
rename from runtime/queries/gitignore/highlights.scm
rename to queries/gitignore/highlights.scm
index aafbe541e..6e83ea6f2 100644
--- a/runtime/queries/gitignore/highlights.scm
+++ b/queries/gitignore/highlights.scm
@@ -1,7 +1,5 @@
(comment) @comment @spell
-(pattern_char) @string.special.path
-
[
(directory_separator)
(directory_separator_escaped)
@@ -11,26 +9,23 @@
(wildcard_char_single)
(wildcard_chars)
(wildcard_chars_allow_slash)
-] @character.special
+ (bracket_negation)
+] @operator
+
+(negation) @punctuation.special
[
(pattern_char_escaped)
(bracket_char_escaped)
] @string.escape
-(negation) @punctuation.special
-
-(bracket_negation) @operator
-
-; bracket expressions
+;; bracket expressions
[
"["
"]"
] @punctuation.bracket
(bracket_char) @constant
-
-(bracket_range
+(bracket_range
"-" @operator)
-
(bracket_char_class) @constant.builtin
diff --git a/queries/gleam/folds.scm b/queries/gleam/folds.scm
new file mode 100644
index 000000000..ff05eeb05
--- /dev/null
+++ b/queries/gleam/folds.scm
@@ -0,0 +1,11 @@
+; Folds
+[
+ (case)
+ (expression_group)
+ (function)
+ (public_function)
+ (anonymous_function)
+ (type_definition)
+ (public_type_definition)
+ (public_opaque_type_definition)
+] @fold
diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm
new file mode 100644
index 000000000..0e2712879
--- /dev/null
+++ b/queries/gleam/highlights.scm
@@ -0,0 +1,167 @@
+; Keywords
+[
+ "as"
+ "let"
+ "todo"
+ "try"
+] @keyword
+
+; Function Keywords
+[
+ "fn"
+ "type"
+] @keyword.function
+
+; Imports
+[
+ "import"
+] @include
+
+; Conditionals
+[
+ "case"
+ "if"
+] @conditional
+
+; Exceptions
+[
+ "assert"
+] @exception
+
+; Punctuation
+[
+ "("
+ ")"
+ "<<"
+ ">>"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+[
+ ","
+ "."
+] @punctuation.delimiter
+
+[
+ "#"
+] @punctuation.special
+
+; Operators
+[
+ "%"
+ "&&"
+ "*"
+ "*."
+ "+"
+ "+."
+ "-"
+ "-."
+ "->"
+ ".."
+ "/"
+ "/."
+ ":"
+ "<"
+ "<."
+ "<="
+ "<=."
+ "="
+ "=="
+ ">"
+ ">."
+ ">="
+ ">=."
+ "|>"
+ "||"
+] @operator
+
+; Identifiers
+(identifier) @variable
+
+; Comments
+[
+ (module_comment)
+ (statement_comment)
+ (comment)
+] @comment
+
+; Unused Identifiers
+[
+ (discard)
+ (hole)
+] @comment
+
+; Modules & Imports
+(module ("/" @namespace)?) @namespace
+(import alias: ((identifier) @namespace)?)
+(remote_type_identifier module: (identifier) @namespace)
+(unqualified_import name: (identifier) @function)
+
+; Strings
+(string) @string
+
+; Bit Strings
+(bit_string_segment) @string.special
+
+; Numbers
+[
+ (integer)
+ (float)
+ (bit_string_segment_option_unit)
+] @number
+
+; Function Parameter Labels
+(function_call arguments: (arguments (argument label: (label) @symbol ":" @symbol)))
+(function_parameter label: (label)? @symbol name: (identifier) @parameter (":" @parameter)?)
+
+; Records
+(record arguments: (arguments (argument label: (label) @property ":" @property)?))
+(record_pattern_argument label: (label) @property ":" @property)
+(record_update_argument label: (label) @property ":" @property)
+(field_access record: (identifier) @variable field: (label) @property)
+
+; Type Constructors
+(data_constructor_argument label: (label) @property ":" @property)
+
+; Type Parameters
+(type_parameter) @parameter
+
+; Types
+((type_identifier) @type (#not-any-of? @type "True" "False"))
+
+; Booleans
+((type_identifier) @boolean (#any-of? @boolean "True" "False"))
+
+; Type Variables
+(type_var) @type
+
+; Type Qualifiers
+[
+ "const"
+ "external"
+ "opaque"
+ "pub"
+] @type.qualifier
+
+; Tuples
+(tuple_access index: (integer) @operator)
+
+; Functions
+(function name: (identifier) @function)
+(public_function name: (identifier) @function)
+(function_call function: (identifier) @function)
+(function_call function: (field_access field: (label) @function))
+
+; External Functions
+(public_external_function name: (identifier) @function)
+(external_function name: (identifier) @function)
+(external_function_body (string) @namespace . (string) @function)
+
+; Pipe Operator
+(binary_expression operator: "|>" right: (identifier) @function)
+
+; Parser Errors
+(ERROR) @error
diff --git a/queries/gleam/indents.scm b/queries/gleam/indents.scm
new file mode 100644
index 000000000..e2259b688
--- /dev/null
+++ b/queries/gleam/indents.scm
@@ -0,0 +1,33 @@
+; Gleam indents similar to Rust and JavaScript
+[
+ (assert)
+ (case)
+ (case_clause)
+ (constant)
+ (expression_group)
+ (external_function)
+ (function)
+ (import)
+ (let)
+ (list)
+ (public_constant)
+ (public_external_function)
+ (public_function)
+ (public_opaque_type_definition)
+ (public_type_alias)
+ (public_type_definition)
+ (todo)
+ (try)
+ (tuple)
+ (type_alias)
+ (type_definition)
+] @indent
+
+[
+ ")"
+ "]"
+ "}"
+] @indent_end @branch
+
+; Gleam pipelines are not indented, but other binary expression chains are
+((binary_expression operator: _ @_operator) @indent (#not-eq? @_operator "|>"))
diff --git a/queries/gleam/injections.scm b/queries/gleam/injections.scm
new file mode 100644
index 000000000..ed4c2de91
--- /dev/null
+++ b/queries/gleam/injections.scm
@@ -0,0 +1,6 @@
+; Comments
+[
+ (module_comment)
+ (statement_comment)
+ (comment)
+] @comment
diff --git a/queries/gleam/locals.scm b/queries/gleam/locals.scm
new file mode 100644
index 000000000..8872e51f0
--- /dev/null
+++ b/queries/gleam/locals.scm
@@ -0,0 +1,24 @@
+; Let Binding Definition
+(let pattern: (identifier) @definition)
+
+; List Pattern Definitions
+(list_pattern (identifier) @definition)
+(list_pattern assign: (identifier) @definition)
+
+; Tuple Pattern Definition
+(tuple_pattern (identifier) @definition)
+
+; Record Pattern Definition
+(record_pattern_argument pattern: (identifier) @definition)
+
+; Function Parameter Definition
+(function_parameter name: (identifier) @definition)
+
+; References
+(identifier) @reference
+
+; Function Body Scope
+(function_body) @scope
+
+; Case Scope
+(case_clause) @scope
diff --git a/queries/glimmer/highlights.scm b/queries/glimmer/highlights.scm
new file mode 100644
index 000000000..b1b3f9141
--- /dev/null
+++ b/queries/glimmer/highlights.scm
@@ -0,0 +1,88 @@
+; === Tag Names ===
+
+; Tags that start with a lower case letter are HTML tags
+; We'll also use this highlighting for named blocks (which start with `:`)
+((tag_name) @tag
+ (#match? @tag "^(:)?[a-z]"))
+; Tags that start with a capital letter are Glimmer components
+((tag_name) @constructor
+ (#lua-match? @constructor "^[A-Z]"))
+
+(attribute_name) @property
+
+(string_literal) @string
+(number_literal) @number
+(boolean_literal) @boolean
+
+(concat_statement) @string
+
+; === Block Statements ===
+
+; Highlight the brackets
+(block_statement_start) @tag.delimiter
+(block_statement_end) @tag.delimiter
+
+; Highlight `if`/`each`/`let`
+(block_statement_start path: (identifier) @conditional)
+(block_statement_end path: (identifier) @conditional)
+((mustache_statement (identifier) @conditional)
+ (#lua-match? @conditional "else"))
+
+; == Mustache Statements ===
+
+; Highlight the whole statement, to color brackets and separators
+(mustache_statement) @tag.delimiter
+
+; An identifier in a mustache expression is a variable
+((mustache_statement [
+ (path_expression (identifier) @variable)
+ (identifier) @variable
+ ])
+ (#not-match? @variable "yield|outlet|this|else"))
+; As are arguments in a block statement
+(block_statement_start argument: [
+ (path_expression (identifier) @variable)
+ (identifier) @variable
+ ])
+; As is an identifier in a block param
+(block_params (identifier) @variable)
+; As are helper arguments
+((helper_invocation argument: [
+ (path_expression (identifier) @variable)
+ (identifier) @variable
+ ])
+ (#not-match? @variable "this"))
+; `this` should be highlighted as a built-in variable
+((identifier) @variable.builtin
+ (#lua-match? @variable.builtin "this"))
+
+; If the identifier is just "yield" or "outlet", it's a keyword
+((mustache_statement (identifier) @keyword)
+ (#any-of? @keyword "yield" "outlet"))
+
+; Helpers are functions
+((helper_invocation helper: [
+ (path_expression (identifier) @function)
+ (identifier) @function
+ ])
+ (#not-match? @function "if|yield"))
+((helper_invocation helper: (identifier) @conditional)
+ (#lua-match? @conditional "if"))
+((helper_invocation helper: (identifier) @keyword)
+ (#lua-match? @keyword "yield"))
+
+(hash_pair key: (identifier) @property)
+
+(comment_statement) @comment
+
+(attribute_node "=" @operator)
+
+(block_params "as" @keyword)
+(block_params "|" @operator)
+
+[
+ "<"
+ ">"
+ ""
+] @tag.delimiter
diff --git a/runtime/queries/glsl/folds.scm b/queries/glsl/folds.scm
similarity index 100%
rename from runtime/queries/glsl/folds.scm
rename to queries/glsl/folds.scm
diff --git a/runtime/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
similarity index 70%
rename from runtime/queries/glsl/highlights.scm
rename to queries/glsl/highlights.scm
index d4583f0ea..4e5e57f47 100644
--- a/runtime/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -25,11 +25,13 @@
"noperspective"
"invariant"
"precise"
-] @keyword.modifier
+] @type.qualifier
"subroutine" @keyword.function
-(extension_storage_class) @keyword.modifier
+(extension_storage_class) @storageclass
-((identifier) @variable.builtin
- (#lua-match? @variable.builtin "^gl_"))
+(
+ (identifier) @variable.builtin
+ (#match? @variable.builtin "^gl_")
+)
diff --git a/runtime/queries/glsl/indents.scm b/queries/glsl/indents.scm
similarity index 100%
rename from runtime/queries/glsl/indents.scm
rename to queries/glsl/indents.scm
diff --git a/queries/glsl/injections.scm b/queries/glsl/injections.scm
new file mode 100644
index 000000000..7d3323b16
--- /dev/null
+++ b/queries/glsl/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @glsl
+
+(comment) @comment
diff --git a/runtime/queries/glsl/locals.scm b/queries/glsl/locals.scm
similarity index 100%
rename from runtime/queries/glsl/locals.scm
rename to queries/glsl/locals.scm
diff --git a/queries/go/folds.scm b/queries/go/folds.scm
new file mode 100644
index 000000000..e1b7a83e9
--- /dev/null
+++ b/queries/go/folds.scm
@@ -0,0 +1,16 @@
+[
+ (const_declaration)
+ (expression_switch_statement)
+ (for_statement)
+ (func_literal)
+ (function_declaration)
+ (if_statement)
+ (import_declaration)
+ (method_declaration)
+ (type_declaration)
+ (var_declaration)
+ (composite_literal)
+ (literal_element)
+ (block)
+] @fold
+
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
new file mode 100644
index 000000000..be72804b6
--- /dev/null
+++ b/queries/go/highlights.scm
@@ -0,0 +1,215 @@
+;; Forked from tree-sitter-go
+;; Copyright (c) 2014 Max Brunsfeld (The MIT License)
+
+;;
+; Identifiers
+
+(type_identifier) @type
+(type_spec name: (type_identifier) @type.definition)
+(field_identifier) @property
+(identifier) @variable
+(package_identifier) @namespace
+
+(parameter_declaration (identifier) @parameter)
+(variadic_parameter_declaration (identifier) @parameter)
+
+(label_name) @label
+
+((identifier) @constant
+ (#eq? @constant "_"))
+
+(const_spec
+ name: (identifier) @constant)
+
+; Function calls
+
+(call_expression
+ function: (identifier) @function.call)
+
+(call_expression
+ function: (selector_expression
+ field: (field_identifier) @method.call))
+
+; Function definitions
+
+(function_declaration
+ name: (identifier) @function)
+
+(method_declaration
+ name: (field_identifier) @method)
+
+(method_spec
+ name: (field_identifier) @method)
+
+; Operators
+
+[
+ "--"
+ "-"
+ "-="
+ ":="
+ "!"
+ "!="
+ "..."
+ "*"
+ "*"
+ "*="
+ "/"
+ "/="
+ "&"
+ "&&"
+ "&="
+ "%"
+ "%="
+ "^"
+ "^="
+ "+"
+ "++"
+ "+="
+ "<-"
+ "<"
+ "<<"
+ "<<="
+ "<="
+ "="
+ "=="
+ ">"
+ ">="
+ ">>"
+ ">>="
+ "|"
+ "|="
+ "||"
+ "~"
+] @operator
+
+; Keywords
+
+[
+ "break"
+ "chan"
+ "const"
+ "continue"
+ "default"
+ "defer"
+ "go"
+ "goto"
+ "interface"
+ "map"
+ "range"
+ "select"
+ "struct"
+ "type"
+ "var"
+ "fallthrough"
+] @keyword
+
+"func" @keyword.function
+"return" @keyword.return
+
+"for" @repeat
+
+[
+ "import"
+ "package"
+] @include
+
+[
+ "else"
+ "case"
+ "switch"
+ "if"
+ ] @conditional
+
+
+;; Builtin types
+
+((type_identifier) @type.builtin
+ (#any-of? @type.builtin
+ "any"
+ "bool"
+ "byte"
+ "complex128"
+ "complex64"
+ "error"
+ "float32"
+ "float64"
+ "int"
+ "int16"
+ "int32"
+ "int64"
+ "int8"
+ "rune"
+ "string"
+ "uint"
+ "uint16"
+ "uint32"
+ "uint64"
+ "uint8"
+ "uintptr"))
+
+
+;; Builtin functions
+
+((identifier) @function.builtin
+ (#any-of? @function.builtin
+ "append"
+ "cap"
+ "close"
+ "complex"
+ "copy"
+ "delete"
+ "imag"
+ "len"
+ "make"
+ "new"
+ "panic"
+ "print"
+ "println"
+ "real"
+ "recover"))
+
+
+; Delimiters
+
+"." @punctuation.delimiter
+"," @punctuation.delimiter
+":" @punctuation.delimiter
+";" @punctuation.delimiter
+
+"(" @punctuation.bracket
+")" @punctuation.bracket
+"{" @punctuation.bracket
+"}" @punctuation.bracket
+"[" @punctuation.bracket
+"]" @punctuation.bracket
+
+
+; Literals
+
+(interpreted_string_literal) @string
+(raw_string_literal) @string @spell
+(rune_literal) @string
+(escape_sequence) @string.escape
+
+(int_literal) @number
+(float_literal) @float
+(imaginary_literal) @number
+
+(true) @boolean
+(false) @boolean
+(nil) @constant.builtin
+
+(keyed_element
+ . (literal_element (identifier) @field))
+(field_declaration name: (field_identifier) @field)
+
+(comment) @comment @spell
+
+(ERROR) @error
+
+((interpreted_string_literal) @spell
+ (#not-has-parent? @spell
+ import_spec
+ )
+)
diff --git a/queries/go/indents.scm b/queries/go/indents.scm
new file mode 100644
index 000000000..c6ac18969
--- /dev/null
+++ b/queries/go/indents.scm
@@ -0,0 +1,31 @@
+[
+ (import_declaration)
+ (const_declaration)
+ (var_declaration)
+ (type_declaration)
+ (func_literal)
+ (literal_value)
+ (expression_case)
+ (default_case)
+ (block)
+ (call_expression)
+ (parameter_list)
+ (struct_type)
+] @indent
+
+[
+ "}"
+] @branch
+
+(const_declaration ")" @branch)
+(import_spec_list ")" @branch)
+(var_declaration ")" @branch)
+
+[
+ "}"
+ ")"
+] @indent_end
+
+(parameter_list ")" @branch)
+
+(comment) @ignore
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/go/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/go/locals.scm b/queries/go/locals.scm
new file mode 100644
index 000000000..1de546c7c
--- /dev/null
+++ b/queries/go/locals.scm
@@ -0,0 +1,79 @@
+(
+ (function_declaration
+ name: (identifier) @definition.function) ;@function
+)
+
+(
+ (method_declaration
+ name: (field_identifier) @definition.method); @method
+)
+
+(short_var_declaration
+ left: (expression_list
+ (identifier) @definition.var))
+
+(var_spec
+ name: (identifier) @definition.var)
+
+(parameter_declaration (identifier) @definition.var)
+(variadic_parameter_declaration (identifier) @definition.var)
+
+(for_statement
+ (range_clause
+ left: (expression_list
+ (identifier) @definition.var)))
+
+(const_declaration
+ (const_spec
+ name: (identifier) @definition.var))
+
+(type_declaration
+ (type_spec
+ name: (type_identifier) @definition.type))
+
+;; reference
+(identifier) @reference
+(type_identifier) @reference
+(field_identifier) @reference
+((package_identifier) @reference
+ (set! reference.kind "namespace"))
+
+(package_clause
+ (package_identifier) @definition.namespace)
+
+(import_spec_list
+ (import_spec
+ name: (package_identifier) @definition.namespace))
+
+;; Call references
+((call_expression
+ function: (identifier) @reference)
+ (set! reference.kind "call" ))
+
+((call_expression
+ function: (selector_expression
+ field: (field_identifier) @reference))
+ (set! reference.kind "call" ))
+
+
+((call_expression
+ function: (parenthesized_expression
+ (identifier) @reference))
+ (set! reference.kind "call" ))
+
+((call_expression
+ function: (parenthesized_expression
+ (selector_expression
+ field: (field_identifier) @reference)))
+ (set! reference.kind "call" ))
+
+;; Scopes
+
+(func_literal) @scope
+(source_file) @scope
+(function_declaration) @scope
+(if_statement) @scope
+(block) @scope
+(expression_switch_statement) @scope
+(for_statement) @scope
+(method_declaration) @scope
diff --git a/runtime/queries/beancount/folds.scm b/queries/godot_resource/folds.scm
similarity index 57%
rename from runtime/queries/beancount/folds.scm
rename to queries/godot_resource/folds.scm
index 9f1b6cbed..943e0628f 100644
--- a/runtime/queries/beancount/folds.scm
+++ b/queries/godot_resource/folds.scm
@@ -1,4 +1,3 @@
[
- (transaction)
(section)
] @fold
diff --git a/queries/godot_resource/highlights.scm b/queries/godot_resource/highlights.scm
new file mode 100644
index 000000000..005ddaacb
--- /dev/null
+++ b/queries/godot_resource/highlights.scm
@@ -0,0 +1,28 @@
+(identifier) @type.builtin
+
+(attribute (identifier) @property)
+(property (path) @property)
+(constructor (identifier) @constructor)
+
+(string) @string
+(integer) @number
+(float) @float
+
+(true) @constant.builtin
+(false) @constant.builtin
+
+[
+ "["
+ "]"
+] @tag.delimiter
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+] @punctuation.bracket
+
+"=" @operator
+
+(ERROR) @error
diff --git a/queries/godot_resource/locals.scm b/queries/godot_resource/locals.scm
new file mode 100644
index 000000000..1dce04f0c
--- /dev/null
+++ b/queries/godot_resource/locals.scm
@@ -0,0 +1,3 @@
+[
+ (section)
+] @scope
diff --git a/queries/gomod/highlights.scm b/queries/gomod/highlights.scm
new file mode 100644
index 000000000..63e1f0128
--- /dev/null
+++ b/queries/gomod/highlights.scm
@@ -0,0 +1,17 @@
+[
+ "require"
+ "replace"
+ "go"
+ "exclude"
+ "retract"
+ "module"
+] @keyword
+
+"=>" @operator
+
+(comment) @comment
+
+[
+(version)
+(go_version)
+] @string
diff --git a/queries/gomod/injections.scm b/queries/gomod/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/gomod/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/gowork/highlights.scm b/queries/gowork/highlights.scm
similarity index 56%
rename from runtime/queries/gowork/highlights.scm
rename to queries/gowork/highlights.scm
index bca9a5f80..9c84bcc44 100644
--- a/runtime/queries/gowork/highlights.scm
+++ b/queries/gowork/highlights.scm
@@ -6,9 +6,9 @@
"=>" @operator
-(comment) @comment @spell
+(comment) @comment
[
- (version)
- (go_version)
+(version)
+(go_version)
] @string
diff --git a/queries/gowork/injections.scm b/queries/gowork/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/gowork/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/graphql/highlights.scm b/queries/graphql/highlights.scm
similarity index 85%
rename from runtime/queries/graphql/highlights.scm
rename to queries/graphql/highlights.scm
index c1ee501c4..3a9d47dad 100644
--- a/runtime/queries/graphql/highlights.scm
+++ b/queries/graphql/highlights.scm
@@ -1,5 +1,6 @@
; Types
;------
+
(scalar_type_definition
(name) @type)
@@ -41,6 +42,7 @@
; Directives
;-----------
+
(directive_definition
"@" @attribute
(name) @attribute)
@@ -49,6 +51,7 @@
; Properties
;-----------
+
(field
(name) @property)
@@ -66,8 +69,9 @@
(enum_value
(name) @property)
-; Variable Definitions and Arguments
+; Variable Definitions and Arguments
;-----------------------------------
+
(operation_definition
(name) @variable)
@@ -76,17 +80,17 @@
(input_fields_definition
(input_value_definition
- (name) @variable.parameter))
+ (name) @parameter))
(argument
- (name) @variable.parameter)
+ (name) @parameter)
(arguments_definition
(input_value_definition
- (name) @variable.parameter))
+ (name) @parameter))
(variable_definition
- (variable) @variable.parameter)
+ (variable) @parameter)
(argument
(value
@@ -94,20 +98,22 @@
; Constants
;----------
+
(string_value) @string
(int_value) @number
-(float_value) @number.float
+(float_value) @float
(boolean_value) @boolean
; Literals
;---------
-(description
- (string_value) @string.documentation @spell)
-(comment) @comment @spell
+(description
+ (string_value) @comment)
+
+(comment) @comment
(directive_location
(executable_directive_location) @type.builtin)
@@ -117,12 +123,17 @@
; Keywords
;----------
+
[
"query"
"mutation"
"subscription"
"fragment"
"scalar"
+ "type"
+ "interface"
+ "union"
+ "enum"
"input"
"extend"
"directive"
@@ -132,32 +143,23 @@
"implements"
] @keyword
-[
- "enum"
- "union"
- "type"
- "interface"
-] @keyword.type
-
; Punctuation
;------------
+
[
- "("
- ")"
- "["
- "]"
- "{"
- "}"
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
] @punctuation.bracket
"=" @operator
"|" @punctuation.delimiter
-
"&" @punctuation.delimiter
-
":" @punctuation.delimiter
"..." @punctuation.special
-
"!" @punctuation.special
diff --git a/queries/graphql/indents.scm b/queries/graphql/indents.scm
new file mode 100644
index 000000000..0f222b6d4
--- /dev/null
+++ b/queries/graphql/indents.scm
@@ -0,0 +1,9 @@
+[
+ (definition)
+ (selection)
+] @indent
+
+[
+ "{"
+ "}"
+] @branch
diff --git a/queries/graphql/injections.scm b/queries/graphql/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/graphql/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/hack/highlights.scm b/queries/hack/highlights.scm
similarity index 55%
rename from runtime/queries/hack/highlights.scm
rename to queries/hack/highlights.scm
index f74233e23..e79d62c75 100644
--- a/runtime/queries/hack/highlights.scm
+++ b/queries/hack/highlights.scm
@@ -1,54 +1,43 @@
(variable) @variable
-
(identifier) @variable
-
((variable) @variable.builtin
- (#eq? @variable.builtin "$this"))
+ (#eq? @variable.builtin "$this"))
(braced_expression) @none
(scoped_identifier
- (qualified_identifier
- (identifier) @type))
+ (qualified_identifier
+ (identifier) @type))
[
(comment)
(heredoc)
-] @comment @spell
-
-((comment) @comment.documentation
- (#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
+] @comment
"function" @keyword.function
[
- "implements"
- "using"
- "attribute"
- "const"
- "extends"
- "insteadof"
+ "async"
+ "await"
+ "type"
+ "interface"
+ "implements"
+ "class"
+ "using"
+ "namespace"
+ "attribute"
+ "const"
+ "extends"
+ "insteadof"
] @keyword
[
- "class"
- "type"
- "interface"
- "namespace"
-] @keyword.type
-
-[
- "async"
- "await"
-] @keyword.coroutine
-
-[
- "use"
- "include"
- "include_once"
- "require"
- "require_once"
-] @keyword.import
+ "use"
+ "include"
+ "include_once"
+ "require"
+ "require_once"
+] @include
[
"new"
@@ -67,7 +56,7 @@
(static_modifier)
(visibility_modifier)
(xhp_modifier)
-] @keyword.modifier
+] @type.qualifier
[
"shape"
@@ -85,7 +74,9 @@
"noreturn"
] @type.builtin
-(null) @constant.builtin
+[
+ (null)
+] @constant.builtin
[
(true)
@@ -93,23 +84,14 @@
] @boolean
(type_specifier) @type
-
(new_expression
(_) @type)
-(alias_declaration
- "newtype"
- .
- (_) @type)
-
-(alias_declaration
- "type"
- .
- (_) @type)
+(alias_declaration "newtype" . (_) @type)
+(alias_declaration "type" . (_) @type)
(class_declaration
name: (identifier) @type)
-
(type_parameter
name: (identifier) @type)
@@ -118,8 +100,8 @@
(identifier) @type .))
[
- "@required"
- "@lateinit"
+ "@required"
+ "@lateinit"
(attribute_modifier)
] @attribute
@@ -138,6 +120,7 @@
"/="
"%="
"**="
+
"==>"
"|>"
"??"
@@ -165,158 +148,132 @@
"/"
"%"
"**"
+
"++"
"--"
"!"
+
"?:"
+
+ "="
+ "??="
+ ".="
+ "|="
+ "^="
+ "&="
+ "<<="
+ ">>="
+ "+="
+ "-="
+ "*="
+ "/="
+ "%="
+ "**="
"=>"
- ; type modifiers
+
+ ;; type modifiers
"@"
"?"
"~"
] @operator
(integer) @number
-
-(float) @number.float
+(float) @float
(parameter
- (variable) @variable.parameter)
+ (variable) @parameter)
(call_expression
- function: (qualified_identifier
- (identifier) @function.call .))
+ function: (qualified_identifier (identifier) @function.call .))
(call_expression
- function: (scoped_identifier
- (identifier) @function.call .))
+ function: (scoped_identifier (identifier) @function.call .))
(call_expression
function: (selection_expression
- (qualified_identifier
- (identifier) @function.method.call .)))
+ (qualified_identifier (identifier) @method.call .)))
(qualified_identifier
- (_) @module
- .
+ (_) @namespace .
(_))
(use_statement
(qualified_identifier
- (_) @module .)
+ (_) @namespace .)
(use_clause))
(use_statement
- (use_type
- "namespace")
+ (use_type "namespace")
(use_clause
(qualified_identifier
- (identifier) @module .)
- alias: (identifier)? @module))
+ (identifier) @namespace .)
+ alias: (identifier)? @namespace))
(use_statement
- (use_type
- "const")
+ (use_type "const")
(use_clause
(qualified_identifier
- (identifier) @constant .)
+ (identifier) @constant .)
alias: (identifier)? @constant))
(use_statement
- (use_type
- "function")
+ (use_type "function")
(use_clause
(qualified_identifier
- (identifier) @function .)
+ (identifier) @function .)
alias: (identifier)? @function))
(use_statement
- (use_type
- "type")
+ (use_type "type")
(use_clause
(qualified_identifier
- (identifier) @type .)
+ (identifier) @type .)
alias: (identifier)? @type))
(use_clause
- (use_type
- "namespace")
+ (use_type "namespace")
(qualified_identifier
- (_) @module .)
- alias: (identifier)? @module)
+ (_) @namespace .)
+ alias: (identifier)? @namespace)
(use_clause
- (use_type
- "function")
+ (use_type "function")
(qualified_identifier
- (_) @function .)
+ (_) @function .)
alias: (identifier)? @function)
(use_clause
- (use_type
- "const")
+ (use_type "const")
(qualified_identifier
- (_) @constant .)
+ (_) @constant .)
alias: (identifier)? @constant)
(use_clause
- (use_type
- "type")
+ (use_type "type")
(qualified_identifier
- (_) @type .)
+ (_) @type .)
alias: (identifier)? @type)
(function_declaration
name: (identifier) @function)
-
(method_declaration
- name: (identifier) @function.method)
+ name: (identifier) @method)
(type_arguments
- [
- "<"
- ">"
- ] @punctuation.bracket)
-
-[
- "("
- ")"
- "["
- "]"
- "{"
- "}"
- "<<"
- ">>"
-] @punctuation.bracket
+ [ "<" ">" ] @punctuation.bracket)
+[ "(" ")" "[" "]" "{" "}" "<<" ">>"] @punctuation.bracket
(xhp_open
- [
- "<"
- ">"
- ] @tag.delimiter)
-
+ [ "<" ">" ] @tag.delimiter)
(xhp_close
- [
- ""
- ] @tag.delimiter)
-
-[
- "."
- ";"
- "::"
- ":"
- ","
-] @punctuation.delimiter
+ [ "" ] @tag.delimiter)
+[ "." ";" "::" ":" "," ] @punctuation.delimiter
(qualified_identifier
"\\" @punctuation.delimiter)
(ternary_expression
- [
- "?"
- ":"
- ] @keyword.conditional.ternary)
+ ["?" ":"] @conditional.ternary)
[
"if"
@@ -324,13 +281,13 @@
"elseif"
"switch"
"case"
-] @keyword.conditional
+] @conditional
[
"try"
"catch"
"finally"
-] @keyword.exception
+] @exception
[
"for"
@@ -339,14 +296,16 @@
"do"
"continue"
"break"
-] @keyword.repeat
+] @repeat
[
- (string)
- (xhp_string)
+ (string)
+ (xhp_string)
] @string
[
- (xhp_open)
- (xhp_close)
+ (xhp_open)
+ (xhp_close)
] @tag
+
+(ERROR) @error
diff --git a/queries/haskell/folds.scm b/queries/haskell/folds.scm
new file mode 100644
index 000000000..28eadf8f3
--- /dev/null
+++ b/queries/haskell/folds.scm
@@ -0,0 +1,5 @@
+[
+ (exp_apply)
+ (exp_do)
+ (function)
+] @fold
diff --git a/queries/haskell/highlights.scm b/queries/haskell/highlights.scm
new file mode 100644
index 000000000..fa342fb8e
--- /dev/null
+++ b/queries/haskell/highlights.scm
@@ -0,0 +1,148 @@
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+(integer) @number
+(exp_negation) @number
+(exp_literal (float)) @float
+(char) @character
+(string) @string
+
+(con_unit) @symbol ; unit, as in ()
+
+(comment) @comment
+
+
+;; ----------------------------------------------------------------------------
+;; Punctuation
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+ (comma)
+ ";"
+] @punctuation.delimiter
+
+
+;; ----------------------------------------------------------------------------
+;; Keywords, operators, includes
+
+[
+ "forall"
+ "∀"
+] @repeat
+
+(pragma) @preproc
+
+[
+ "if"
+ "then"
+ "else"
+ "case"
+ "of"
+] @conditional
+
+[
+ "import"
+ "qualified"
+ "module"
+] @include
+
+[
+ (operator)
+ (constructor_operator)
+ (type_operator)
+ (tycon_arrow)
+ (qualified_module) ; grabs the `.` (dot), ex: import System.IO
+ (all_names)
+ (wildcard)
+ "="
+ "|"
+ "::"
+ "=>"
+ "->"
+ "<-"
+ "\\"
+ "`"
+ "@"
+] @operator
+
+(module) @namespace
+
+[
+ (where)
+ "let"
+ "in"
+ "class"
+ "instance"
+ "pattern"
+ "data"
+ "newtype"
+ "family"
+ "type"
+ "as"
+ "hiding"
+ "deriving"
+ "via"
+ "stock"
+ "anyclass"
+ "do"
+ "mdo"
+ "rec"
+ "infix"
+ "infixl"
+ "infixr"
+] @keyword
+
+
+;; ----------------------------------------------------------------------------
+;; Functions and variables
+
+(variable) @variable
+(pat_wildcard) @variable
+
+(signature name: (variable) @type)
+(function
+ name: (variable) @function
+ patterns: (patterns))
+((signature (fun)) . (function (variable) @function))
+((signature (context (fun))) . (function (variable) @function))
+((signature (forall (context (fun)))) . (function (variable) @function))
+
+(exp_infix (variable) @operator) ; consider infix functions as operators
+
+(exp_infix (exp_name) @function.call (#set! "priority" 101))
+(exp_apply . (exp_name (variable) @function.call))
+(exp_apply . (exp_name (qualified_variable (variable) @function.call)))
+
+
+;; ----------------------------------------------------------------------------
+;; Types
+
+(type) @type
+(type_variable) @type
+
+(constructor) @constructor
+
+; True or False
+((constructor) @_bool (#match? @_bool "(True|False)")) @boolean
+
+
+;; ----------------------------------------------------------------------------
+;; Quasi-quotes
+
+(quoter) @function.call
+; Highlighting of quasiquote_body is handled by injections.scm
+
+;; ----------------------------------------------------------------------------
+;; Spell checking
+
+(string) @spell
+(comment) @spell
+
diff --git a/queries/haskell/injections.scm b/queries/haskell/injections.scm
new file mode 100644
index 000000000..206248f6e
--- /dev/null
+++ b/queries/haskell/injections.scm
@@ -0,0 +1,78 @@
+;; -----------------------------------------------------------------------------
+;; General language injection
+
+(quasiquote
+ ((quoter) @language)
+ ((quasiquote_body) @content)
+)
+
+(comment) @comment
+
+;; -----------------------------------------------------------------------------
+;; shakespeare library
+;; NOTE: doesn't support templating
+
+; TODO: add once CoffeeScript parser is added
+; ; CoffeeScript: Text.Coffee
+; (quasiquote
+; (quoter) @_name
+; (#eq? @_name "coffee")
+; ((quasiquote_body) @coffeescript)
+
+; CSS: Text.Cassius, Text.Lucius
+(quasiquote
+ (quoter) @_name
+ (#any-of? @_name "cassius" "lucius")
+ ((quasiquote_body) @css)
+)
+
+; HTML: Text.Hamlet
+(quasiquote
+ (quoter) @_name
+ (#any-of? @_name "shamlet" "xshamlet" "hamlet" "xhamlet" "ihamlet")
+ ((quasiquote_body) @html)
+)
+
+; JS: Text.Julius
+(quasiquote
+ (quoter) @_name
+ (#any-of? @_name "js" "julius")
+ ((quasiquote_body) @javascript)
+)
+
+; TS: Text.TypeScript
+(quasiquote
+ (quoter) @_name
+ (#any-of? @_name "tsc" "tscJSX")
+ ((quasiquote_body) @typescript)
+)
+
+
+;; -----------------------------------------------------------------------------
+;; HSX
+
+(quasiquote
+ (quoter) @_name
+ (#eq? @_name "hsx")
+ ((quasiquote_body) @html)
+)
+
+;; -----------------------------------------------------------------------------
+;; Inline JSON from aeson
+
+(quasiquote
+ (quoter) @_name
+ (#eq? @_name "aesonQQ")
+ ((quasiquote_body) @json)
+)
+
+
+;; -----------------------------------------------------------------------------
+;; SQL
+
+; postgresql-simple
+(quasiquote
+ (quoter) @_name
+ (#eq? @_name "sql")
+ ((quasiquote_body) @sql)
+)
diff --git a/queries/hcl/folds.scm b/queries/hcl/folds.scm
new file mode 100644
index 000000000..cb20b2aa8
--- /dev/null
+++ b/queries/hcl/folds.scm
@@ -0,0 +1,6 @@
+[
+ (comment)
+ (block)
+ (heredoc_template)
+ (object)
+] @fold
diff --git a/runtime/queries/hcl/highlights.scm b/queries/hcl/highlights.scm
similarity index 52%
rename from runtime/queries/hcl/highlights.scm
rename to queries/hcl/highlights.scm
index f2c784f6f..658369292 100644
--- a/runtime/queries/hcl/highlights.scm
+++ b/queries/hcl/highlights.scm
@@ -1,10 +1,11 @@
; highlights.scm
+
[
"!"
- "*"
+ "\*"
"/"
"%"
- "+"
+ "\+"
"-"
">"
">="
@@ -34,7 +35,7 @@
[
(ellipsis)
- "?"
+ "\?"
"=>"
] @punctuation.special
@@ -47,17 +48,17 @@
"for"
"endfor"
"in"
-] @keyword.repeat
+] @repeat
-[
+[
"if"
"else"
"endif"
-] @keyword.conditional
+] @conditional
[
(quoted_template_start) ; "
- (quoted_template_end) ; "
+ (quoted_template_end); "
(template_literal) ; non-interpolation/directive content
] @string
@@ -75,44 +76,27 @@
] @punctuation.special
(numeric_lit) @number
-
(bool_lit) @boolean
-
(null_lit) @constant
-
(comment) @comment @spell
-
(identifier) @variable
-(body
- (block
- (identifier) @keyword))
-
-(body
- (block
- (body
- (block
- (identifier) @type))))
-
-(function_call
- (identifier) @function)
-
-(attribute
- (identifier) @variable.member)
+(block (identifier) @type)
+(function_call (identifier) @function)
+(attribute (identifier) @field)
; { key: val }
;
; highlight identifier keys as though they were block attributes
-(object_elem
- key: (expression
- (variable_expr
- (identifier) @variable.member)))
+(object_elem key: (expression (variable_expr (identifier) @field)))
-; var.foo, data.bar
-;
-; first element in get_attr is a variable.builtin or a reference to a variable.builtin
-(expression
+((identifier) @keyword (#any-of? @keyword "module" "root" "cwd" "resource" "variable" "data" "locals" "terraform" "provider" "output"))
+((identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
+(variable_expr (identifier) @variable.builtin (#any-of? @variable.builtin "var" "local" "path"))
+(get_attr (identifier) @variable.builtin (#any-of? @variable.builtin "root" "cwd" "module"))
+
+(object_elem val: (expression
(variable_expr
- (identifier) @variable.builtin)
- (get_attr
- (identifier) @variable.member))
+ (identifier) @type.builtin (#any-of? @type.builtin "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
+
+(ERROR) @error
diff --git a/queries/hcl/indents.scm b/queries/hcl/indents.scm
new file mode 100644
index 000000000..d68ec3081
--- /dev/null
+++ b/queries/hcl/indents.scm
@@ -0,0 +1,15 @@
+[
+ (block)
+ (object)
+ (tuple)
+ (function_call)
+] @indent
+
+[
+ "]"
+ ")"
+ "}"
+] @branch @indent_end
+
+(comment) @auto
+(ERROR) @auto
diff --git a/queries/hcl/injections.scm b/queries/hcl/injections.scm
new file mode 100644
index 000000000..94451beb4
--- /dev/null
+++ b/queries/hcl/injections.scm
@@ -0,0 +1,7 @@
+(comment) @comment
+
+(heredoc_template
+ (template_literal) @content
+ (heredoc_identifier) @language
+ (#set! "language" @language)
+ (#downcase! "language"))
diff --git a/runtime/queries/heex/folds.scm b/queries/heex/folds.scm
similarity index 100%
rename from runtime/queries/heex/folds.scm
rename to queries/heex/folds.scm
diff --git a/runtime/queries/heex/highlights.scm b/queries/heex/highlights.scm
similarity index 76%
rename from runtime/queries/heex/highlights.scm
rename to queries/heex/highlights.scm
index e2fb01880..7dd4dd6fd 100644
--- a/runtime/queries/heex/highlights.scm
+++ b/queries/heex/highlights.scm
@@ -27,28 +27,30 @@
(doctype) @constant
; HEEx comments are highlighted as such
-(comment) @comment @spell
+(comment) @comment
; HEEx text content is treated as markup
-; (text) @none
+(text) @text
+
+; Tree-sitter parser errors
+(ERROR) @error
+
; HEEx tags and slots are highlighted as HTML
[
- (tag_name)
- (slot_name)
+ (tag_name)
+ (slot_name)
] @tag
; HEEx attributes are highlighted as HTML attributes
(attribute_name) @tag.attribute
-
[
(attribute_value)
(quoted_attribute_value)
] @string
; HEEx components are highlighted as modules and function calls
-(component_name
- [
- (module) @type
- (function) @function
- "." @punctuation.delimiter
- ])
+(component_name [
+ (module) @type
+ (function) @function
+ "." @punctuation.delimiter
+])
diff --git a/runtime/queries/heex/indents.scm b/queries/heex/indents.scm
similarity index 83%
rename from runtime/queries/heex/indents.scm
rename to queries/heex/indents.scm
index 82a2f8912..99fc693dc 100644
--- a/runtime/queries/heex/indents.scm
+++ b/queries/heex/indents.scm
@@ -3,18 +3,18 @@
(component)
(slot)
(tag)
-] @indent.begin
+] @indent
; Dedent at the end of each tag, component, and slot
[
(end_component)
(end_slot)
(end_tag)
-] @indent.branch @indent.dedent
+] @branch @dedent
; Self-closing tags and components should not change
; indentation level of sibling nodes
[
(self_closing_component)
(self_closing_tag)
-] @indent.auto
+] @auto
diff --git a/queries/heex/injections.scm b/queries/heex/injections.scm
new file mode 100644
index 000000000..fffd1dc53
--- /dev/null
+++ b/queries/heex/injections.scm
@@ -0,0 +1,11 @@
+; HEEx directives can span multiple interpolated lines of Elixir
+(directive [
+ (expression_value)
+ (partial_expression_value)
+] @elixir @combined)
+
+; HEEx Elixir expressions are always within a tag or component
+(expression (expression_value) @elixir)
+
+; HEEx comments
+(comment) @comment
diff --git a/runtime/queries/heex/locals.scm b/queries/heex/locals.scm
similarity index 85%
rename from runtime/queries/heex/locals.scm
rename to queries/heex/locals.scm
index cfa239e5f..4371bc979 100644
--- a/runtime/queries/heex/locals.scm
+++ b/queries/heex/locals.scm
@@ -3,11 +3,11 @@
(component_name)
(slot_name)
(tag_name)
-] @local.reference
+] @reference
; Create a new scope within each HEEx tag, component, and slot
[
(component)
(slot)
(tag)
-] @local.scope
+] @scope
diff --git a/queries/help/highlights.scm b/queries/help/highlights.scm
new file mode 100644
index 000000000..c0d88301b
--- /dev/null
+++ b/queries/help/highlights.scm
@@ -0,0 +1,25 @@
+(h1) @text.title
+(h2) @text.title
+(h3) @text.title
+(column_heading) @text.title
+(column_heading
+ "~" @conceal (#set! conceal ""))
+(tag
+ "*" @conceal (#set! conceal "")
+ text: (_) @label)
+(taglink
+ "|" @conceal (#set! conceal "")
+ text: (_) @text.reference)
+(optionlink
+ text: (_) @text.reference)
+(codespan
+ "`" @conceal (#set! conceal "")
+ text: (_) @text.literal)
+(codeblock) @text.literal
+(codeblock
+ [">" (language)] @conceal (#set! conceal ""))
+(block
+ "<" @conceal (#set! conceal ""))
+(argument) @parameter
+(keycode) @string.special
+(url) @text.uri
diff --git a/queries/help/injections.scm b/queries/help/injections.scm
new file mode 100644
index 000000000..09bbe44e8
--- /dev/null
+++ b/queries/help/injections.scm
@@ -0,0 +1,3 @@
+(codeblock
+ (language) @language
+ (code) @content)
diff --git a/runtime/queries/hjson/folds.scm b/queries/hjson/folds.scm
similarity index 100%
rename from runtime/queries/hjson/folds.scm
rename to queries/hjson/folds.scm
diff --git a/runtime/queries/hjson/highlights.scm b/queries/hjson/highlights.scm
similarity index 67%
rename from runtime/queries/hjson/highlights.scm
rename to queries/hjson/highlights.scm
index 8333d8fe5..c8eed139f 100644
--- a/runtime/queries/hjson/highlights.scm
+++ b/queries/hjson/highlights.scm
@@ -1,28 +1,16 @@
(true) @boolean
-
(false) @boolean
-
(null) @constant.builtin
-
(number) @number
-
-(pair
- key: (string) @label)
-
-(pair
- value: (string) @string)
-
-(array
- (string) @string)
-
+(pair key: (string) @label)
+(pair value: (string) @string)
+(array (string) @string)
; (string_content (escape_sequence) @string.escape)
+(ERROR) @error
; "," @punctuation.delimiter
"[" @punctuation.bracket
-
"]" @punctuation.bracket
-
"{" @punctuation.bracket
-
"}" @punctuation.bracket
-(comment) @comment @spell
+(comment) @comment
diff --git a/queries/hjson/indents.scm b/queries/hjson/indents.scm
new file mode 100644
index 000000000..26a42eeda
--- /dev/null
+++ b/queries/hjson/indents.scm
@@ -0,0 +1,3 @@
+; inherits: json
+
+(comment) @ignore
diff --git a/queries/hjson/injections.scm b/queries/hjson/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/hjson/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/hjson/locals.scm b/queries/hjson/locals.scm
similarity index 100%
rename from runtime/queries/hjson/locals.scm
rename to queries/hjson/locals.scm
diff --git a/runtime/queries/hlsl/folds.scm b/queries/hlsl/folds.scm
similarity index 100%
rename from runtime/queries/hlsl/folds.scm
rename to queries/hlsl/folds.scm
diff --git a/runtime/queries/hlsl/highlights.scm b/queries/hlsl/highlights.scm
similarity index 69%
rename from runtime/queries/hlsl/highlights.scm
rename to queries/hlsl/highlights.scm
index 839d8d79a..68e9e44bd 100644
--- a/runtime/queries/hlsl/highlights.scm
+++ b/queries/hlsl/highlights.scm
@@ -24,15 +24,12 @@
"triangleadj"
"lineadj"
"triangle"
-] @keyword.modifier
+] @type.qualifier
-((identifier) @variable.builtin
- (#lua-match? @variable.builtin "^SV_"))
+(
+ (identifier) @variable.builtin
+ (#lua-match? @variable.builtin "^SV_")
+)
(hlsl_attribute) @attribute
-
-(hlsl_attribute
- [
- "["
- "]"
- ] @attribute)
+(hlsl_attribute ["[" "]"] @attribute)
diff --git a/runtime/queries/hlsl/indents.scm b/queries/hlsl/indents.scm
similarity index 100%
rename from runtime/queries/hlsl/indents.scm
rename to queries/hlsl/indents.scm
diff --git a/queries/hlsl/injections.scm b/queries/hlsl/injections.scm
new file mode 100644
index 000000000..537ae542d
--- /dev/null
+++ b/queries/hlsl/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @hlsl
+
+(comment) @comment
diff --git a/runtime/queries/hlsl/locals.scm b/queries/hlsl/locals.scm
similarity index 100%
rename from runtime/queries/hlsl/locals.scm
rename to queries/hlsl/locals.scm
diff --git a/queries/hocon/highlights.scm b/queries/hocon/highlights.scm
new file mode 100644
index 000000000..3fb8249a9
--- /dev/null
+++ b/queries/hocon/highlights.scm
@@ -0,0 +1,37 @@
+(comment) @comment
+
+(null) @constant.builtin
+[ (true) (false) ] @boolean
+(number) @number
+(unit) @keyword
+(string) @string
+(multiline_string) @string
+(string (escape_sequence) @string.escape)
+(unquoted_string) @string
+
+[ "url"
+ "file"
+ "classpath"
+ "required"
+] @keyword
+
+(include "include" @include)
+
+(substitution ["${" "${?" "}"] @punctuation.special)
+(substitution (_) @field)
+
+(path (_) @field)
+(value [":" "=" "+=" ] @operator)
+
+[
+ "("
+ ")"
+ "["
+ "]"
+ "{"
+ "}"
+] @punctuation.bracket
+
+[ "," ] @punctuation.delimiter
+(unquoted_path "." @punctuation.delimiter)
+
diff --git a/queries/hocon/injections.scm b/queries/hocon/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/hocon/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/runtime/queries/html/folds.scm b/queries/html/folds.scm
similarity index 100%
rename from runtime/queries/html/folds.scm
rename to queries/html/folds.scm
diff --git a/runtime/queries/html/highlights.scm b/queries/html/highlights.scm
similarity index 68%
rename from runtime/queries/html/highlights.scm
rename to queries/html/highlights.scm
index 4e2371d64..6da261c0a 100644
--- a/runtime/queries/html/highlights.scm
+++ b/queries/html/highlights.scm
@@ -3,5 +3,3 @@
(doctype) @constant
""
+ ""
+] @tag.delimiter
+
+"=" @operator
diff --git a/queries/html_tags/indents.scm b/queries/html_tags/indents.scm
new file mode 100644
index 000000000..7b9d6afe1
--- /dev/null
+++ b/queries/html_tags/indents.scm
@@ -0,0 +1,11 @@
+[
+ (element)
+] @indent
+
+[
+ (end_tag)
+ ">"
+ "/>"
+] @branch
+
+(comment) @ignore
diff --git a/queries/html_tags/injections.scm b/queries/html_tags/injections.scm
new file mode 100644
index 000000000..80c0d2a4a
--- /dev/null
+++ b/queries/html_tags/injections.scm
@@ -0,0 +1,7 @@
+((style_element
+ (raw_text) @css))
+
+((script_element
+ (raw_text) @javascript))
+
+(comment) @comment
diff --git a/queries/http/highlights.scm b/queries/http/highlights.scm
new file mode 100644
index 000000000..f5a08813b
--- /dev/null
+++ b/queries/http/highlights.scm
@@ -0,0 +1,19 @@
+; inherits: json
+
+; Display errors
+(ERROR) @error
+
+; Comments
+(comment) @comment
+
+(request
+ method: (method) @keyword
+ url: (url) @text.uri)
+
+(header
+ name: (name) @constant
+ value: (value))
+
+; rest.nvim Neovim plugin specific features
+(external_body
+ json_file: (json_file) @text.uri) @keyword
diff --git a/queries/http/injections.scm b/queries/http/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/http/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
new file mode 100644
index 000000000..63cb01237
--- /dev/null
+++ b/queries/java/highlights.scm
@@ -0,0 +1,274 @@
+; CREDITS @maxbrunsfeld (maxbrunsfeld@gmail.com)
+
+; Variables
+
+(identifier) @variable
+
+; Methods
+
+(method_declaration
+ name: (identifier) @method)
+(method_invocation
+ name: (identifier) @method.call)
+
+(super) @function.builtin
+
+; Parameters
+(formal_parameter
+ name: (identifier) @parameter)
+(catch_formal_parameter
+ name: (identifier) @parameter)
+
+(spread_parameter
+ (variable_declarator) @parameter) ; int... foo
+
+;; Lambda parameter
+(inferred_parameters (identifier) @parameter) ; (x,y) -> ...
+(lambda_expression
+ parameters: (identifier) @parameter) ; x -> ...
+
+
+; Annotations
+
+
+(annotation
+ name: (identifier) @attribute)
+(marker_annotation
+ name: (identifier) @attribute)
+
+
+; Operators
+
+[
+"@"
+"+"
+":"
+"++"
+"-"
+"--"
+"&"
+"&&"
+"|"
+"||"
+"!="
+"=="
+"*"
+"/"
+"%"
+"<"
+"<="
+">"
+">="
+"="
+"-="
+"+="
+"*="
+"/="
+"%="
+"->"
+"^"
+"^="
+"&="
+"|="
+"~"
+">>"
+">>>"
+"<<"
+"::"
+] @operator
+
+; Types
+
+(interface_declaration
+ name: (identifier) @type)
+(class_declaration
+ name: (identifier) @type)
+(record_declaration
+ name: (identifier) @type)
+(enum_declaration
+ name: (identifier) @type)
+(constructor_declaration
+ name: (identifier) @type)
+(type_identifier) @type
+((method_invocation
+ object: (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+((method_reference
+ . (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+
+
+
+((field_access
+ object: (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+((scoped_identifier
+ scope: (identifier) @type)
+ (#lua-match? @type "^[A-Z]"))
+
+; Fields
+
+(field_declaration
+ declarator: (variable_declarator) @field)
+
+(field_access
+ field: (identifier) @field)
+
+[
+(boolean_type)
+(integral_type)
+(floating_point_type)
+(void_type)
+] @type.builtin
+
+; Variables
+
+((identifier) @constant
+ (#lua-match? @constant "^[A-Z_][A-Z%d_]+$"))
+
+(this) @variable.builtin
+
+; Literals
+
+[
+(hex_integer_literal)
+(decimal_integer_literal)
+(octal_integer_literal)
+(binary_integer_literal)
+] @number
+
+[
+(decimal_floating_point_literal)
+(hex_floating_point_literal)
+] @float
+
+(character_literal) @character
+[(string_literal) (text_block)] @string
+(null_literal) @constant.builtin
+
+[
+ (line_comment)
+ (block_comment)
+] @comment @spell
+
+[
+(true)
+(false)
+] @boolean
+
+; Keywords
+
+[
+"assert"
+"break"
+"class"
+"record"
+"continue"
+"default"
+"enum"
+"exports"
+"extends"
+"implements"
+"instanceof"
+"interface"
+"module"
+"opens"
+"package"
+"permits"
+"provides"
+"requires"
+"to"
+"uses"
+"with"
+] @keyword
+
+(synchronized_statement
+ "synchronized" @keyword)
+
+[
+"abstract"
+"final"
+"native"
+"non-sealed"
+"open"
+"private"
+"protected"
+"public"
+"sealed"
+"static"
+"strictfp"
+"transitive"
+] @type.qualifier
+
+(modifiers
+ "synchronized" @type.qualifier)
+
+[
+"transient"
+"volatile"
+] @storageclass
+
+[
+"return"
+"yield"
+] @keyword.return
+
+[
+ "new"
+] @keyword.operator
+
+; Conditionals
+
+[
+"if"
+"else"
+"switch"
+"case"
+] @conditional
+
+(ternary_expression ["?" ":"] @conditional.ternary)
+
+;
+
+[
+"for"
+"while"
+"do"
+] @repeat
+
+; Includes
+
+"import" @include
+"package" @include
+
+; Punctuation
+
+[
+";"
+"."
+"..."
+","
+] @punctuation.delimiter
+
+[
+"["
+"]"
+"{"
+"}"
+"("
+")"
+] @punctuation.bracket
+
+; Exceptions
+
+[
+"throw"
+"throws"
+"finally"
+"try"
+"catch"
+] @exception
+
+; Labels
+(labeled_statement
+ (identifier) @label)
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
new file mode 100644
index 000000000..8e5375486
--- /dev/null
+++ b/queries/java/indents.scm
@@ -0,0 +1,34 @@
+[
+ (class_body)
+ (enum_body)
+ (interface_body)
+ (constructor_declaration)
+ (constructor_body)
+ (block)
+ (switch_block)
+ (array_initializer)
+ (argument_list)
+ (formal_parameters)
+] @indent
+
+(expression_statement (method_invocation) @indent)
+
+[
+ "("
+ ")"
+ "{"
+ "}"
+ "["
+ "]"
+] @branch
+
+[
+ "}"
+] @indent_end
+
+(line_comment) @ignore
+
+[
+ (ERROR)
+ (block_comment)
+] @auto
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
new file mode 100644
index 000000000..e4fd85f1c
--- /dev/null
+++ b/queries/java/injections.scm
@@ -0,0 +1 @@
+[(block_comment) (line_comment)] @comment
diff --git a/queries/java/locals.scm b/queries/java/locals.scm
new file mode 100644
index 000000000..a7a624289
--- /dev/null
+++ b/queries/java/locals.scm
@@ -0,0 +1,77 @@
+; SCOPES
+; declarations
+(program) @scope
+(class_declaration
+ body: (_) @scope)
+(record_declaration
+ body: (_) @scope)
+(enum_declaration
+ body: (_) @scope)
+(lambda_expression) @scope
+(enhanced_for_statement) @scope
+
+; block
+(block) @scope
+
+; if/else
+(if_statement) @scope ; if+else
+(if_statement
+ consequence: (_) @scope) ; if body in case there are no braces
+(if_statement
+ alternative: (_) @scope) ; else body in case there are no braces
+
+; try/catch
+(try_statement) @scope ; covers try+catch, individual try and catch are covered by (block)
+(catch_clause) @scope ; needed because `Exception` variable
+
+; loops
+(for_statement) @scope ; whole for_statement because loop iterator variable
+(for_statement ; "for" body in case there are no braces
+ body: (_) @scope)
+(do_statement
+ body: (_) @scope)
+(while_statement
+ body: (_) @scope)
+
+; Functions
+
+(constructor_declaration) @scope
+(method_declaration) @scope
+
+
+; DEFINITIONS
+(package_declaration
+ (identifier) @definition.namespace)
+(class_declaration
+ name: (identifier) @definition.type)
+(record_declaration
+ name: (identifier) @definition.type)
+(enum_declaration
+ name: (identifier) @definition.enum)
+(method_declaration
+ name: (identifier) @definition.method)
+
+(local_variable_declaration
+ declarator: (variable_declarator
+ 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) {
+ name: (identifier) @definition.var)
+
+((scoped_identifier
+ (identifier) @definition.import)
+ (#has-ancestor? @definition.import import_declaration))
+
+(field_declaration
+ declarator: (variable_declarator
+ name: (identifier) @definition.field))
+
+; REFERENCES
+(identifier) @reference
+(type_identifier) @reference
diff --git a/runtime/queries/javascript/folds.scm b/queries/javascript/folds.scm
similarity index 100%
rename from runtime/queries/javascript/folds.scm
rename to queries/javascript/folds.scm
diff --git a/queries/javascript/highlights.scm b/queries/javascript/highlights.scm
new file mode 100644
index 000000000..b62679c4b
--- /dev/null
+++ b/queries/javascript/highlights.scm
@@ -0,0 +1,36 @@
+; inherits: ecma,jsx
+
+;;; Parameters
+(formal_parameters (identifier) @parameter)
+
+(formal_parameters
+ (rest_pattern
+ (identifier) @parameter))
+
+;; ({ a }) => null
+(formal_parameters
+ (object_pattern
+ (shorthand_property_identifier_pattern) @parameter))
+
+;; ({ a: b }) => null
+(formal_parameters
+ (object_pattern
+ (pair_pattern
+ value: (identifier) @parameter)))
+
+;; ([ a ]) => null
+(formal_parameters
+ (array_pattern
+ (identifier) @parameter))
+
+;; a => null
+(arrow_function
+ parameter: (identifier) @parameter)
+
+;; optional parameters
+(formal_parameters
+ (assignment_pattern
+ left: (identifier) @parameter))
+
+;; punctuation
+(optional_chain) @punctuation.delimiter
diff --git a/runtime/queries/javascript/indents.scm b/queries/javascript/indents.scm
similarity index 100%
rename from runtime/queries/javascript/indents.scm
rename to queries/javascript/indents.scm
diff --git a/runtime/queries/javascript/injections.scm b/queries/javascript/injections.scm
similarity index 100%
rename from runtime/queries/javascript/injections.scm
rename to queries/javascript/injections.scm
diff --git a/queries/javascript/locals.scm b/queries/javascript/locals.scm
new file mode 100644
index 000000000..098f18af6
--- /dev/null
+++ b/queries/javascript/locals.scm
@@ -0,0 +1,63 @@
+; inherits: ecma,jsx
+
+; Both properties are matched here.
+;
+; class Foo {
+; this.#bar = "baz";
+; this.quuz = "qux";
+; }
+(field_definition
+ property: [(property_identifier) (private_property_identifier)] @definition.var)
+
+; this.foo = "bar"
+(assignment_expression
+ left: (member_expression
+ object: (this)
+ property: (property_identifier) @definition.var))
+
+(formal_parameters
+ (identifier) @definition.parameter)
+
+; function(arg = []) {
+(formal_parameters
+ (assignment_pattern
+ left: (identifier) @definition.parameter))
+
+; x => x
+(arrow_function
+ parameter: (identifier) @definition.parameter)
+
+;; ({ a }) => null
+(formal_parameters
+ (object_pattern
+ (shorthand_property_identifier_pattern) @definition.parameter))
+
+;; ({ a: b }) => null
+(formal_parameters
+ (object_pattern
+ (pair_pattern
+ value: (identifier) @definition.parameter)))
+
+;; ([ a ]) => null
+(formal_parameters
+ (array_pattern
+ (identifier) @definition.parameter))
+
+(formal_parameters
+ (rest_pattern
+ (identifier) @definition.parameter))
+
+; Both methods are matched here.
+;
+; class Foo {
+; #bar(x) { x }
+; baz(y) { y }
+; }
+(method_definition
+ ([(property_identifier) (private_property_identifier)] @definition.function)
+ (#set! definition.var.scope parent))
+
+; this.foo()
+(member_expression
+ object: (this)
+ property: (property_identifier) @reference)
diff --git a/queries/jq/highlights.scm b/queries/jq/highlights.scm
new file mode 100644
index 000000000..0793e159e
--- /dev/null
+++ b/queries/jq/highlights.scm
@@ -0,0 +1,329 @@
+; Variables
+
+(variable) @variable
+
+((variable) @constant.builtin
+ (#eq? @constant.builtin "$ENV"))
+
+((variable) @constant.macro
+ (#eq? @constant.macro "$__loc__"))
+
+; Properties
+
+(index
+ (identifier) @property)
+
+; Labels
+
+(query
+ label: (variable) @label)
+
+(query
+ break_statement: (variable) @label)
+
+; Literals
+
+(number) @number
+
+(string) @string
+
+[
+ "true"
+ "false"
+] @boolean
+
+("null") @type.builtin
+
+; Interpolation
+
+["\\(" ")"] @character.special
+
+; Format
+
+(format) @attribute
+
+; Functions
+
+(funcdef
+ (identifier) @function)
+
+(funcdefargs
+ (identifier) @parameter)
+
+[
+ "reduce"
+ "foreach"
+] @function.builtin
+
+; jq -n 'builtins | map(split("/")[0]) | unique | .[]'
+((funcname) @function.builtin
+ (#any-of? @function.builtin
+ "IN"
+ "INDEX"
+ "JOIN"
+ "acos"
+ "acosh"
+ "add"
+ "all"
+ "any"
+ "arrays"
+ "ascii_downcase"
+ "ascii_upcase"
+ "asin"
+ "asinh"
+ "atan"
+ "atan2"
+ "atanh"
+ "booleans"
+ "bsearch"
+ "builtins"
+ "capture"
+ "cbrt"
+ "ceil"
+ "combinations"
+ "contains"
+ "copysign"
+ "cos"
+ "cosh"
+ "debug"
+ "del"
+ "delpaths"
+ "drem"
+ "empty"
+ "endswith"
+ "env"
+ "erf"
+ "erfc"
+ "error"
+ "exp"
+ "exp10"
+ "exp2"
+ "explode"
+ "expm1"
+ "fabs"
+ "fdim"
+ "finites"
+ "first"
+ "flatten"
+ "floor"
+ "fma"
+ "fmax"
+ "fmin"
+ "fmod"
+ "format"
+ "frexp"
+ "from_entries"
+ "fromdate"
+ "fromdateiso8601"
+ "fromjson"
+ "fromstream"
+ "gamma"
+ "get_jq_origin"
+ "get_prog_origin"
+ "get_search_list"
+ "getpath"
+ "gmtime"
+ "group_by"
+ "gsub"
+ "halt"
+ "halt_error"
+ "has"
+ "hypot"
+ "implode"
+ "in"
+ "index"
+ "indices"
+ "infinite"
+ "input"
+ "input_filename"
+ "input_line_number"
+ "inputs"
+ "inside"
+ "isempty"
+ "isfinite"
+ "isinfinite"
+ "isnan"
+ "isnormal"
+ "iterables"
+ "j0"
+ "j1"
+ "jn"
+ "join"
+ "keys"
+ "keys_unsorted"
+ "last"
+ "ldexp"
+ "leaf_paths"
+ "length"
+ "lgamma"
+ "lgamma_r"
+ "limit"
+ "localtime"
+ "log"
+ "log10"
+ "log1p"
+ "log2"
+ "logb"
+ "ltrimstr"
+ "map"
+ "map_values"
+ "match"
+ "max"
+ "max_by"
+ "min"
+ "min_by"
+ "mktime"
+ "modf"
+ "modulemeta"
+ "nan"
+ "nearbyint"
+ "nextafter"
+ "nexttoward"
+ "normals"
+ "not"
+ "now"
+ "nth"
+ "nulls"
+ "numbers"
+ "objects"
+ "path"
+ "paths"
+ "pow"
+ "pow10"
+ "range"
+ "recurse"
+ "recurse_down"
+ "remainder"
+ "repeat"
+ "reverse"
+ "rindex"
+ "rint"
+ "round"
+ "rtrimstr"
+ "scalars"
+ "scalars_or_empty"
+ "scalb"
+ "scalbln"
+ "scan"
+ "select"
+ "setpath"
+ "significand"
+ "sin"
+ "sinh"
+ "sort"
+ "sort_by"
+ "split"
+ "splits"
+ "sqrt"
+ "startswith"
+ "stderr"
+ "strflocaltime"
+ "strftime"
+ "strings"
+ "strptime"
+ "sub"
+ "tan"
+ "tanh"
+ "test"
+ "tgamma"
+ "to_entries"
+ "todate"
+ "todateiso8601"
+ "tojson"
+ "tonumber"
+ "tostream"
+ "tostring"
+ "transpose"
+ "trunc"
+ "truncate_stream"
+ "type"
+ "unique"
+ "unique_by"
+ "until"
+ "utf8bytelength"
+ "values"
+ "walk"
+ "while"
+ "with_entries"
+ "y0"
+ "y1"
+ "yn"))
+
+; Keywords
+
+[
+ "def"
+ "as"
+ "label"
+ "module"
+ "break"
+] @keyword
+
+[
+ "import"
+ "include"
+] @include
+
+[
+ "if"
+ "then"
+ "else"
+ "end"
+] @conditional
+
+[
+ "try"
+ "catch"
+] @exception
+
+[
+ "or"
+ "and"
+] @keyword.operator
+
+; Operators
+
+[
+ "."
+ "=="
+ "!="
+ ">"
+ ">="
+ "<="
+ "<"
+ "="
+ "+"
+ "-"
+ "*"
+ "/"
+ "%"
+ "+="
+ "-="
+ "*="
+ "/="
+ "%="
+ "//="
+ "|"
+ "?"
+ "//"
+ "?//"
+ (recurse) ; ".."
+] @operator
+
+; Punctuation
+
+[
+ ";"
+ ","
+ ":"
+] @punctuation.delimiter
+
+[
+ "[" "]"
+ "{" "}"
+ "(" ")"
+] @punctuation.bracket
+
+; Comments
+
+(comment) @comment @spell
diff --git a/queries/jq/injections.scm b/queries/jq/injections.scm
new file mode 100644
index 000000000..5b3913967
--- /dev/null
+++ b/queries/jq/injections.scm
@@ -0,0 +1,31 @@
+(comment) @comment
+
+; test(val)
+(query
+ ((funcname) @_function
+ (#any-of? @_function
+ "test"
+ "match"
+ "capture"
+ "scan"
+ "split"
+ "splits"
+ "sub"
+ "gsub"))
+ (args . (query (string) @regex)))
+
+
+; test(regex; flags)
+(query
+ ((funcname) @_function
+ (#any-of? @_function
+ "test"
+ "match"
+ "capture"
+ "scan"
+ "split"
+ "splits"
+ "sub"
+ "gsub"))
+ (args . (args
+ (query (string) @regex))))
diff --git a/queries/jsdoc/highlights.scm b/queries/jsdoc/highlights.scm
new file mode 100644
index 000000000..4b4266c9f
--- /dev/null
+++ b/queries/jsdoc/highlights.scm
@@ -0,0 +1,2 @@
+(tag_name) @keyword
+(type) @type
diff --git a/runtime/queries/json/folds.scm b/queries/json/folds.scm
similarity index 100%
rename from runtime/queries/json/folds.scm
rename to queries/json/folds.scm
diff --git a/queries/json/highlights.scm b/queries/json/highlights.scm
new file mode 100644
index 000000000..f41b44a5a
--- /dev/null
+++ b/queries/json/highlights.scm
@@ -0,0 +1,17 @@
+(true) @boolean
+(false) @boolean
+(null) @constant.builtin
+(number) @number
+(pair key: (string) @label)
+(pair value: (string) @string)
+(array (string) @string)
+(string_content (escape_sequence) @string.escape)
+(string_content) @spell
+(ERROR) @error
+["," ":"] @punctuation.delimiter
+"[" @punctuation.bracket
+"]" @punctuation.bracket
+"{" @punctuation.bracket
+"}" @punctuation.bracket
+
+(("\"" @conceal) (#set! conceal ""))
diff --git a/queries/json/indents.scm b/queries/json/indents.scm
new file mode 100644
index 000000000..0345b945b
--- /dev/null
+++ b/queries/json/indents.scm
@@ -0,0 +1,9 @@
+[
+ (object)
+ (array)
+] @indent
+
+[
+ "}"
+ "]"
+] @branch
diff --git a/runtime/queries/hocon/folds.scm b/queries/json/locals.scm
similarity index 71%
rename from runtime/queries/hocon/folds.scm
rename to queries/json/locals.scm
index cc8a231a4..6609a2d22 100644
--- a/runtime/queries/hocon/folds.scm
+++ b/queries/json/locals.scm
@@ -1,4 +1,4 @@
[
(object)
(array)
-] @fold
+] @scope
diff --git a/queries/json5/highlights.scm b/queries/json5/highlights.scm
new file mode 100644
index 000000000..4e41971ba
--- /dev/null
+++ b/queries/json5/highlights.scm
@@ -0,0 +1,17 @@
+[
+ "true"
+ "false"
+] @boolean
+
+"null" @constant
+
+(string) @string
+
+(number) @number
+
+(comment) @comment
+
+(member
+ name: (_) @keyword)
+
+(ERROR) @error
diff --git a/queries/json5/injections.scm b/queries/json5/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/json5/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/jsonc/folds.scm b/queries/jsonc/folds.scm
new file mode 100644
index 000000000..41269219e
--- /dev/null
+++ b/queries/jsonc/folds.scm
@@ -0,0 +1 @@
+; inherits: json
diff --git a/queries/jsonc/highlights.scm b/queries/jsonc/highlights.scm
new file mode 100644
index 000000000..e50112155
--- /dev/null
+++ b/queries/jsonc/highlights.scm
@@ -0,0 +1,3 @@
+; inherits: json
+
+(comment) @comment @spell
diff --git a/queries/jsonc/indents.scm b/queries/jsonc/indents.scm
new file mode 100644
index 000000000..26a42eeda
--- /dev/null
+++ b/queries/jsonc/indents.scm
@@ -0,0 +1,3 @@
+; inherits: json
+
+(comment) @ignore
diff --git a/queries/jsonc/injections.scm b/queries/jsonc/injections.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/queries/jsonc/injections.scm
@@ -0,0 +1 @@
+(comment) @comment
diff --git a/queries/jsonc/locals.scm b/queries/jsonc/locals.scm
new file mode 100644
index 000000000..41269219e
--- /dev/null
+++ b/queries/jsonc/locals.scm
@@ -0,0 +1 @@
+; inherits: json
diff --git a/queries/jsonnet/highlights.scm b/queries/jsonnet/highlights.scm
new file mode 100644
index 000000000..eb8d22be9
--- /dev/null
+++ b/queries/jsonnet/highlights.scm
@@ -0,0 +1,76 @@
+[
+ (true)
+ (false)
+] @boolean
+
+(comment) @comment
+(id) @variable
+(import) @include
+(null) @constant.builtin
+(number) @number
+(string) @string
+
+(fieldname (id) @label)
+
+[
+ "["
+ "]"
+ "{"
+ "}"
+ "("
+ ")"
+] @punctuation.bracket
+
+[
+ "."
+ ","
+ ";"
+ ":"
+ "::"
+ ":::"
+] @punctuation.delimiter
+
+(expr
+ operator: (_) @operator)
+[
+ "+"
+ "="
+] @operator
+
+"in" @keyword.operator
+
+[
+ (local)
+ "assert"
+] @keyword
+
+[
+ "else"
+ "if"
+ "then"
+] @conditional
+
+[
+ (dollar)
+ (self)
+] @variable.builtin
+((id) @variable.builtin
+ (#eq? @variable.builtin "std"))
+
+; Function declaration
+(bind
+ function: (id) @function
+ params: (params
+ (param
+ identifier: (id) @parameter)))
+
+; Function call
+(expr
+ (expr (id) @function.call)
+ "("
+ (args
+ (named_argument
+ (id) @parameter))?
+ ")")
+
+(ERROR) @error
diff --git a/runtime/queries/jsx/folds.scm b/queries/jsx/folds.scm
similarity index 100%
rename from runtime/queries/jsx/folds.scm
rename to queries/jsx/folds.scm
diff --git a/queries/jsx/highlights.scm b/queries/jsx/highlights.scm
new file mode 100644
index 000000000..1f19c6b2a
--- /dev/null
+++ b/queries/jsx/highlights.scm
@@ -0,0 +1,36 @@
+(jsx_element
+ open_tag: (jsx_opening_element ["<" ">"] @tag.delimiter))
+(jsx_element
+ close_tag: (jsx_closing_element ["<" "/" ">"] @tag.delimiter))
+(jsx_self_closing_element ["/" ">" "<"] @tag.delimiter)
+(jsx_fragment [">" "<" "/"] @tag.delimiter)
+(jsx_attribute (property_identifier) @tag.attribute)
+
+(jsx_opening_element
+ name: (identifier) @tag)
+
+(jsx_closing_element
+ name: (identifier) @tag)
+
+(jsx_self_closing_element
+ name: (identifier) @tag)
+
+(jsx_opening_element ((identifier) @constructor
+ (#lua-match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively -
+(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_closing_element ((identifier) @constructor
+ (#lua-match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively -
+(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_self_closing_element ((identifier) @constructor
+ (#lua-match? @constructor "^[A-Z]")))
+
+; Handle the dot operator effectively -
+(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
+
+(jsx_text) @none
diff --git a/queries/jsx/indents.scm b/queries/jsx/indents.scm
new file mode 100644
index 000000000..d1a12be9c
--- /dev/null
+++ b/queries/jsx/indents.scm
@@ -0,0 +1,12 @@
+[
+ (jsx_fragment)
+ (jsx_element)
+ (jsx_self_closing_element)
+] @indent
+
+(parenthesized_expression) @indent
+
+[
+ (jsx_closing_element)
+ ">"
+] @branch
diff --git a/queries/jsx/injections.scm b/queries/jsx/injections.scm
new file mode 100644
index 000000000..3a96931b0
--- /dev/null
+++ b/queries/jsx/injections.scm
@@ -0,0 +1,8 @@
+; Styled Jsx
-;
-; Add "lang" to predicate check so that vue/svelte can inherit this
-; without having this element being captured twice
-((style_element
- (start_tag) @_no_type_lang
- (raw_text) @injection.content)
- (#not-lua-match? @_no_type_lang "%slang%s*=")
- (#not-lua-match? @_no_type_lang "%stype%s*=")
- (#set! injection.language "css"))
-
-((style_element
- (start_tag
- (attribute
- (attribute_name) @_type
- (quoted_attribute_value
- (attribute_value) @_css)))
- (raw_text) @injection.content)
- (#eq? @_type "type")
- (#eq? @_css "text/css")
- (#set! injection.language "css"))
-
-;
-;
-((script_element
- (start_tag) @_no_type_lang
- (raw_text) @injection.content)
- (#not-lua-match? @_no_type_lang "%slang%s*=")
- (#not-lua-match? @_no_type_lang "%stype%s*=")
- (#set! injection.language "javascript"))
-
-;
-
-
+ 
+ 
+ 
+